drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,506 Commits 1 Branch 0 Tags
Commit Graph

80506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
d1e57d7886 am 15635728: am 27db797e: Merge "Update MediaRouteChooserDialog grouping UI" into jb-dev 
* commit '15635728a4ff00da6cc3d6468c02d39e5631f124':
  Update MediaRouteChooserDialog grouping UI
 2012-06-15 11:57:26 -07:00
Adam Powell
15635728a4 am 27db797e: Merge "Update MediaRouteChooserDialog grouping UI" into jb-dev 
* commit '27db797e37ea16ea5db6eb3f6a32e0f116c1b824':
  Update MediaRouteChooserDialog grouping UI
 2012-06-15 11:54:42 -07:00
Daniel Sandler
6e6f54f706 am c82a664c: am 708f0739: Merge "Hide "no internet connection" when connected some other way." into jb-dev 
* commit 'c82a664ca34885251edcfd044c142ab79e787f9c':
  Hide "no internet connection" when connected some other way.
 2012-06-15 11:52:24 -07:00
Adam Powell
27db797e37 Merge "Update MediaRouteChooserDialog grouping UI" into jb-dev 2012-06-15 11:52:10 -07:00
Daniel Sandler
c82a664ca3 am 708f0739: Merge "Hide "no internet connection" when connected some other way." into jb-dev 
* commit '708f0739a54c2505921df4366a3ae301ba1edb20':
  Hide "no internet connection" when connected some other way.
 2012-06-15 11:49:46 -07:00
Daniel Sandler
708f0739a5 Merge "Hide "no internet connection" when connected some other way." into jb-dev 2012-06-15 11:46:35 -07:00
Daniel Sandler
67234c4b87 Hide "no internet connection" when connected some other way. 
We now track whether the device is connected at all, and use
this to suppress the disconnected message in the mobile
status string (we previously just looked at wifi
connectivity).

So, if a device is attached via ethernet:

- On wifi-only devices, the combined label is shown in the
  notification panel, so you'll see "ETHERNET" (this comes
  straight from EthernetDataTracker; at some point we need
  localized strings and icons).

- On mobile-data devices (phones), the notification panel
  only shows the mobile data label, which will be
  suppressed, so you'll see nothing at all.

Bug: 6648292
Change-Id: I9841eaeffe50a4f046afbdc09d80c5bd4d78a839
 2012-06-15 13:21:16 -04:00
Jean-Baptiste Queru
96de8392c6 am a310500f: am 2dd63ccd: am d8ccd712: Merge "Parcel compRequired flag correctly." 
* commit 'a310500f6c29685e6b3db3f3e58fc8415272a13c':
  Parcel compRequired flag correctly.
 2012-06-15 10:16:26 -07:00
Jean-Baptiste Queru
a310500f6c am 2dd63ccd: am d8ccd712: Merge "Parcel compRequired flag correctly." 
* commit '2dd63ccdb0e4109d03c51a002ff785c9d8a8ccb9':
  Parcel compRequired flag correctly.
 2012-06-15 10:13:31 -07:00
Jean-Baptiste Queru
2dd63ccdb0 am d8ccd712: Merge "Parcel compRequired flag correctly." 
* commit 'd8ccd712dac9e8f4e8068b02f5ca55b014de831a':
  Parcel compRequired flag correctly.
 2012-06-15 10:10:50 -07:00
Jean-Baptiste Queru
d8ccd712da Merge "Parcel compRequired flag correctly." 2012-06-15 10:02:58 -07:00
John Reck
c0c66d33a8 Merge "Remove unused" 2012-06-15 09:38:07 -07:00
Justin Ho
5d8024a86a am f103e8bb: am 137bfad2: Merge "Jelly Bean ringtone Bug: 6619980" into jb-dev 
* commit 'f103e8bbe468b96bf042af14bff75a71796bc466':
  Jelly Bean ringtone Bug: 6619980
 2012-06-15 09:30:04 -07:00
Justin Ho
f103e8bbe4 am 137bfad2: Merge "Jelly Bean ringtone Bug: 6619980" into jb-dev 
* commit '137bfad24f26fb3526329aadfe02d751e87027b5':
  Jelly Bean ringtone Bug: 6619980
 2012-06-15 09:25:34 -07:00
Justin Ho
137bfad24f Merge "Jelly Bean ringtone Bug: 6619980" into jb-dev 2012-06-15 09:23:25 -07:00
Daniel Sandler
a136e2aeed am 02a56e16: am 2fc45503: Merge "Concatenate SPN and PLMN with a pipe." into jb-dev 
* commit '02a56e169678ed6cf500f173c7475cc005bf5473':
  Concatenate SPN and PLMN with a pipe.
 2012-06-15 09:22:16 -07:00
Daniel Sandler
02a56e1696 am 2fc45503: Merge "Concatenate SPN and PLMN with a pipe." into jb-dev 
* commit '2fc45503dd653095c0476146e5560d13bb968975':
  Concatenate SPN and PLMN with a pipe.
 2012-06-15 09:19:34 -07:00
Daniel Sandler
2fc45503dd Merge "Concatenate SPN and PLMN with a pipe." into jb-dev 2012-06-15 09:17:03 -07:00
Justin Ho
b633a039a0 Jelly Bean ringtone 
Bug: 6619980

Change-Id: I717c66274d3efaafb0caa60204d311732c182268
 2012-06-15 08:48:49 -07:00
Adam Powell
b5e2af5919 Update MediaRouteChooserDialog grouping UI 
Move UserRouteInfo tag support to RouteInfo

Change-Id: Ia753924f8613462d5f74736be93a8d748689eef1
 2012-06-15 00:11:34 -07:00
Dianne Hackborn
4ca38ff44e am 4879c1e8: am 734f0214: Merge "Help out issue #6654729: CAB + screen off during playback" into jb-dev 
* commit '4879c1e8b3ae01800290a3702526a601f4637692':
  Help out issue #6654729: CAB + screen off during playback
 2012-06-14 21:38:55 -07:00
Dianne Hackborn
4879c1e8b3 am 734f0214: Merge "Help out issue #6654729: CAB + screen off during playback" into jb-dev 
* commit '734f0214ec04e6c734aeec78d15f6db478cfb55c':
  Help out issue #6654729: CAB + screen off during playback
 2012-06-14 21:35:55 -07:00
Jeff Brown
84ce6565b0 am 655410e7: am 5c74bca4: Merge "Synthesize fake vsyncs when the screen is off." into jb-dev 
* commit '655410e7b3c79bb705aaba0bdfc77ecdaa25d4ca':
  Synthesize fake vsyncs when the screen is off.
 2012-06-14 21:34:39 -07:00
Dianne Hackborn
734f0214ec Merge "Help out issue #6654729: CAB + screen off during playback" into jb-dev 2012-06-14 21:33:48 -07:00
Jeff Brown
655410e7b3 am 5c74bca4: Merge "Synthesize fake vsyncs when the screen is off." into jb-dev 
* commit '5c74bca49a48c3316aca9fed00d287cb8cbc2be4':
  Synthesize fake vsyncs when the screen is off.
 2012-06-14 21:32:36 -07:00
Jeff Brown
5c74bca49a Merge "Synthesize fake vsyncs when the screen is off." into jb-dev 2012-06-14 21:30:49 -07:00
Daniel Sandler
8b96a660e5 Concatenate SPN and PLMN with a pipe. 
Prior change 199020 fixes it for instances of CarrierLabel;
this fixes it for customers of NetworkController.

Bug: 6639047
Change-Id: I69dada2298f4a3caf453f43d847cdb32fe7eaa9f
 2012-06-14 23:54:55 -04:00
Matthew Xie
3199209c92 am 8607127d: am 839734bb: Merge "Handle ENITR failure for Headset control channel." into jb-dev 
* commit '8607127d8bd9bf87cce9dde5451c926a14548bfd':
  Handle ENITR failure for Headset control channel.
 2012-06-14 20:33:56 -07:00
Jeff Brown
858491ba13 Synthesize fake vsyncs when the screen is off. 
When the screen is off, we might not receive real vsync pulses from
the hardware which would cause posted Choreographer callbacks to not run.
This is bad because messages in the Looper might be blocked behind a barrier
that is scheduled to be removed by one of those Choreographer callback
(see ViewRootImpl.doTraversals).  Until the barrier is removed, those messages
will not run.  To prevent starvation of the Looper, we synthesize fake vsync
pulses at a reduced rate whenever the display hardware stops generating them.

This change should fix a variety of rare non-deterministic bugs where
the system might appear to be unresponsive while the screen is off,
and spurious ANRs reported shortly after the screen is turned back on.

Bug: 6574842
Bug: 6636995
Bug: 6643559
Change-Id: I263f2fdf979afd79e5ac47a0cc5d34a93b860c21
 2012-06-14 20:33:42 -07:00
Matthew Xie
8607127d8b am 839734bb: Merge "Handle ENITR failure for Headset control channel." into jb-dev 
* commit '839734bbe502c876237a0473823b606803051825':
  Handle ENITR failure for Headset control channel.
 2012-06-14 20:31:15 -07:00
Matthew Xie
839734bbe5 Merge "Handle ENITR failure for Headset control channel." into jb-dev 2012-06-14 20:28:46 -07:00
Matthew Xie
be513afb62 Handle ENITR failure for Headset control channel. 
Wrap poll and read with TEMP_FAILURE_RETRY
bug 6503000, 6623444

Change-Id: I2e302dc04df6b5bd5982c3d189881a687a95fb2d
 2012-06-14 20:08:40 -07:00
Christopher Tate
d71aae2329 am 0d732fe6: am 0e44a6be: Merge "Don\'t finish noHistory="true" activities behind the lock screen" into jb-dev 
* commit '0d732fe68c6c68e93b6ca33d75e92b55ef95a97a':
  Don't finish noHistory="true" activities behind the lock screen
 2012-06-14 19:40:22 -07:00
Dianne Hackborn
b80395c17d Help out issue #6654729: CAB + screen off during playback 
People generally expect, if they are using FLAG_KEEP_SCREEN_ON,
that the screen won't immediately dim after it is cleared, even
if it has been passed the user activity timeout since the last
user interaction.  So include the flag to reset the user activity
timeout when releasing its wake lock.

Change-Id: If7a8fea8faef3edbf13dff10a2f248adc9e3ff0b
 2012-06-14 19:38:20 -07:00
Christopher Tate
0d732fe68c am 0e44a6be: Merge "Don\'t finish noHistory="true" activities behind the lock screen" into jb-dev 
* commit '0e44a6beeae8a17e81145b83f2dfb8f719d41f52':
  Don't finish noHistory="true" activities behind the lock screen
 2012-06-14 19:37:45 -07:00
Christopher Tate
0e44a6beea Merge "Don't finish noHistory="true" activities behind the lock screen" into jb-dev 2012-06-14 19:35:58 -07:00
Adam Powell
2f115bc007 am 13b5c194: am 90b9f84c: Merge "API updates for MediaRouter" into jb-dev 
* commit '13b5c194e1ca2ed5ca9187e15ca0518b8bb052d2':
  API updates for MediaRouter
 2012-06-14 18:30:55 -07:00
Christopher Tate
88c0699539 am 5eed873f: am 7661bc6c: Merge "Run the screen on/off broadcasts at foreground priority" into jb-dev 
* commit '5eed873f1076b685d3a8538894a49f29f85d1189':
  Run the screen on/off broadcasts at foreground priority
 2012-06-14 18:30:51 -07:00
Svetoslav Ganov
9bec724d90 am 42fb511f: am 2657a59f: Merge "Add support for NEXT_HTML_ELEMENT to WebViewClassic." into jb-dev 
* commit '42fb511f1b5dd399bda3cd9fb3896bfe428a7837':
  Add support for NEXT_HTML_ELEMENT to WebViewClassic.
 2012-06-14 18:30:42 -07:00
George Mount
7de2b552de am 33dea30b: (-s ours) am 0777558f: Merge "DO NOT MERGE Respect the "Make password visible" setting." into jb-dev 
* commit '33dea30bf0957fc521092b8e29b6c0558ffb7cfe':
  DO NOT MERGE Respect the "Make password visible" setting.
 2012-06-14 18:30:36 -07:00
Daniel Sandler
90e76aaac7 am 8ce090d9: am 68a808bc: Merge "Show even fewer notifications in Setup." into jb-dev 
* commit '8ce090d936efc65dd68ba9fc15f99e1029cf58f2':
  Show even fewer notifications in Setup.
 2012-06-14 18:30:31 -07:00
Adam Powell
13b5c194e1 am 90b9f84c: Merge "API updates for MediaRouter" into jb-dev 
* commit '90b9f84c43145c51180c7253cd3a3f59862c2611':
  API updates for MediaRouter
 2012-06-14 17:58:05 -07:00
Adam Powell
90b9f84c43 Merge "API updates for MediaRouter" into jb-dev 2012-06-14 17:51:27 -07:00
Christopher Tate
5eed873f10 am 7661bc6c: Merge "Run the screen on/off broadcasts at foreground priority" into jb-dev 
* commit '7661bc6c5afef4cca8ccee2f859906f8fb64087b':
  Run the screen on/off broadcasts at foreground priority
 2012-06-14 17:37:05 -07:00
Christopher Tate
7661bc6c5a Merge "Run the screen on/off broadcasts at foreground priority" into jb-dev 2012-06-14 17:34:28 -07:00
Svetoslav Ganov
42fb511f1b am 2657a59f: Merge "Add support for NEXT_HTML_ELEMENT to WebViewClassic." into jb-dev 
* commit '2657a59f54e316ca11d7d9adf648e7001960f469':
  Add support for NEXT_HTML_ELEMENT to WebViewClassic.
 2012-06-14 17:22:24 -07:00
Svetoslav Ganov
2657a59f54 Merge "Add support for NEXT_HTML_ELEMENT to WebViewClassic." into jb-dev 2012-06-14 17:19:54 -07:00
John Reck
c0dc36d19e Remove unused 
Change-Id: If75de601f2fcf6309897f2005d505082e8cd4934
 2012-06-14 17:19:27 -07:00
Svetoslav Ganov
6df7343222 am b6b2af3c: am 9add5654: Merge "AccessibilityInjector should return false on a failed action." into jb-dev 
* commit 'b6b2af3cd182141030d6ffa8540d99058978e2d8':
  AccessibilityInjector should return false on a failed action.
 2012-06-14 17:09:00 -07:00
Craig Mautner
7cf23ee478 am de90d67b: am 8b9c6d51: Merge "Expose apps when keyguard animating." into jb-dev 
* commit 'de90d67b2f3da4d931455df3c58d9c0f8ea3ffb5':
  Expose apps when keyguard animating.
 2012-06-14 17:08:57 -07:00