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

9243 Commits

Author SHA1 Message Date
Daniel Sandler
d0dee22255 am 36074eec: am 1f075299: Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev 
* commit '36074eecccaaa52e535513829b9de13ac3930347':
  Allow any user to clear a notification targeted at USER_ALL.
 2012-10-15 22:28:24 -07:00
Daniel Sandler
36074eeccc am 1f075299: Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev 
* commit '1f0752993ffd4339cdf0e7d69b96093503bd2e24':
  Allow any user to clear a notification targeted at USER_ALL.
 2012-10-15 22:25:20 -07:00
Daniel Sandler
1f0752993f Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev 2012-10-15 22:23:29 -07:00
Craig Mautner
6404f11bd6 am 9018c0a9: am f6dbd61b: Merge "Always layout Keyguard on config change." into jb-mr1-dev 
* commit '9018c0a96fa9d3e422fdef630be481d8ba96298a':
  Always layout Keyguard on config change.
 2012-10-15 22:11:12 -07:00
Craig Mautner
9018c0a96f am f6dbd61b: Merge "Always layout Keyguard on config change." into jb-mr1-dev 
* commit 'f6dbd61b108e586c1db3e61cbfc07d4d750027c0':
  Always layout Keyguard on config change.
 2012-10-15 22:09:05 -07:00
Craig Mautner
f6dbd61b10 Merge "Always layout Keyguard on config change." into jb-mr1-dev 2012-10-15 22:05:55 -07:00
Jamie Gennis
b312f1155c am 38041d6b: am 809bb404: Merge "Flag window animation transactions as animations." into jb-mr1-dev 
* commit '38041d6b3c3d838d99f70f9b1195d69487edf689':
  Flag window animation transactions as animations.
 2012-10-15 20:19:40 -07:00
Jeff Brown
19e2d23cf4 am d56d6702: am 0e082155: Merge "Stop dreaming if the battery not charging effectively." into jb-mr1-dev 
* commit 'd56d67020b149558a9dc4ec9db1278f5c60bc946':
  Stop dreaming if the battery not charging effectively.
 2012-10-15 20:19:17 -07:00
Jeff Brown
09b37314b6 am 6593105c: am 322de606: Merge "Cleanup some internal documentation." into jb-mr1-dev 
* commit '6593105cbcfeb1aa8379861ad35e2e7ff96b29f8':
  Cleanup some internal documentation.
 2012-10-15 20:19:12 -07:00
Jeff Brown
006f6dfc4c am 4eaba60f: am df409231: Merge "Update wifi display device name when renamed." into jb-mr1-dev 
* commit '4eaba60fff4a91cc883b27cfcfb9b241ddee218f':
  Update wifi display device name when renamed.
 2012-10-15 20:18:47 -07:00
Jamie Gennis
38041d6b3c am 809bb404: Merge "Flag window animation transactions as animations." into jb-mr1-dev 
* commit '809bb404da66498f1723279542d2a7d1f4512052':
  Flag window animation transactions as animations.
 2012-10-15 19:54:18 -07:00
Jamie Gennis
809bb404da Merge "Flag window animation transactions as animations." into jb-mr1-dev 2012-10-15 19:52:05 -07:00
Jamie Gennis
b6ce6e42cc Flag window animation transactions as animations. 
This change makes WindowManager use the new eAnimation flag when animating
windows.  This prevents some of the window updates from being combined with
updates from prior animation frames.

Bug: 7353840
Change-Id: I5a9f8fa2c1a2f5f08363a45cd9f28bb97cd77080
 2012-10-15 19:19:50 -07:00
Jeff Brown
d56d67020b am 0e082155: Merge "Stop dreaming if the battery not charging effectively." into jb-mr1-dev 
* commit '0e082155ef2d7390d7befc139a788d3def94fecc':
  Stop dreaming if the battery not charging effectively.
 2012-10-15 18:43:08 -07:00
Jeff Brown
6593105cbc am 322de606: Merge "Cleanup some internal documentation." into jb-mr1-dev 
* commit '322de606574f45d1a4335b515369ce27c74d2b6b':
  Cleanup some internal documentation.
 2012-10-15 18:43:04 -07:00
Jeff Brown
0e082155ef Merge "Stop dreaming if the battery not charging effectively." into jb-mr1-dev 2012-10-15 18:41:11 -07:00
Jeff Brown
322de60657 Merge "Cleanup some internal documentation." into jb-mr1-dev 2012-10-15 18:40:05 -07:00
Jeff Brown
4eaba60fff am df409231: Merge "Update wifi display device name when renamed." into jb-mr1-dev 
* commit 'df409231a75c8b2ae976af66c0baec99b280aa33':
  Update wifi display device name when renamed.
 2012-10-15 17:23:39 -07:00
Jeff Brown
df409231a7 Merge "Update wifi display device name when renamed." into jb-mr1-dev 2012-10-15 17:21:20 -07:00
Jeff Brown
016ff14f12 Stop dreaming if the battery not charging effectively. 
If the user activity timeout expired and the battery appears
to be draining faster than it is charging then stop dreaming
and go to sleep.

Bug: 7312455
Change-Id: I1b9d89e5b2647c72c455d2792e3778a2fe6a4e34
 2012-10-15 16:56:20 -07:00
Jeff Brown
ab887a09ad Cleanup some internal documentation. 
Bug: 7312455
Change-Id: Idefd71f2e9d1abe1b2671dac9702edf7f5fbc118
 2012-10-15 16:01:37 -07:00
Victoria Lease
98ef010daf am aca6527e: am 3f840c8c: Merge "fix crashing apps" into jb-mr1-dev 
* commit 'aca6527ed6d7b27ca80c0b8d8be8928df597a951':
  fix crashing apps
 2012-10-15 15:55:50 -07:00
Victoria Lease
aca6527ed6 am 3f840c8c: Merge "fix crashing apps" into jb-mr1-dev 
* commit '3f840c8c3c1c53f046f6d187b2d3c4120b8d8afe':
  fix crashing apps
 2012-10-15 15:52:53 -07:00
Victoria Lease
3f840c8c3c Merge "fix crashing apps" into jb-mr1-dev 2012-10-15 15:50:00 -07:00
Jeff Brown
ee4f029ff4 Update wifi display device name when renamed. 
Bug: 7340725
Change-Id: Ia3835a37fa3800371920f863b82f992efe764664
 2012-10-15 15:31:59 -07:00
Victoria Lease
da479c5f8c fix crashing apps 
Bug: 7349330
Change-Id: Iea61bce23cb197c7a28d574098253823df73a99b
 2012-10-15 15:24:16 -07:00
Jeff Sharkey
288c32805b am ec8d1280: am 532c9c45: Merge "Protect more service dump() methods." into jb-mr1-dev 
* commit 'ec8d1280ac70245dcc533054b748f794f33f85bd':
  Protect more service dump() methods.
 2012-10-15 14:06:09 -07:00
Jeff Sharkey
ec8d1280ac am 532c9c45: Merge "Protect more service dump() methods." into jb-mr1-dev 
* commit '532c9c4543135463ee1f39b282d3156a3e226d50':
  Protect more service dump() methods.
 2012-10-15 14:03:53 -07:00
Jeff Sharkey
532c9c4543 Merge "Protect more service dump() methods." into jb-mr1-dev 2012-10-15 14:01:57 -07:00
Craig Mautner
a3f4bf531f Always layout Keyguard on config change. 
Add Keyguard to list of windows that can't be hidden by keyguard.

Don't assign Configuration to window until layout has had a chance
to compare it to window's existing Configuration.

Bug: 7094175
Change-Id: I99a9fd4af9a31871fe130db7b6bdf49bd51a6092
 2012-10-15 13:45:17 -07:00
Robert Greenwalt
af614e7d3c am 4e579b5a: am a30d9694: Merge "Monitor the right interface re VPN" into jb-mr1-dev 
* commit '4e579b5ac23fc2eda314fb43600c83ebc3eb2cd0':
  Monitor the right interface re VPN
 2012-10-15 11:38:41 -07:00
Daniel Sandler
321e9c562b Allow any user to clear a notification targeted at USER_ALL. 
This also adds the userid to notification_* eventlogs.

Bug: 7325802
Change-Id: I48055caf1344acd58b61607bf0be38cc299fc7be
 2012-10-15 14:38:39 -04:00
Robert Greenwalt
4e579b5ac2 am a30d9694: Merge "Monitor the right interface re VPN" into jb-mr1-dev 
* commit 'a30d969401a8533a5a341664421ba9b1e150bac3':
  Monitor the right interface re VPN
 2012-10-15 11:37:13 -07:00
Robert Greenwalt
a30d969401 Merge "Monitor the right interface re VPN" into jb-mr1-dev 2012-10-15 11:34:13 -07:00
Jeff Sharkey
52801aae89 Protect more service dump() methods. 
Bug: 6406965
Change-Id: Ia45a580c1e6f403308e7e540f18f2c0505af0f29
 2012-10-15 10:59:51 -07:00
Dianne Hackborn
547c20dfc8 am 48f6b7e2: am 59cb2cf1: Merge "Revert fix to issue #6880627: PendingIntent.getService() returns..." into jb-mr1-dev 
* commit '48f6b7e228f4b18181756b7c97df094b86a550aa':
  Revert fix to issue #6880627: PendingIntent.getService() returns...
 2012-10-12 17:48:12 -07:00
Dianne Hackborn
48f6b7e228 am 59cb2cf1: Merge "Revert fix to issue #6880627: PendingIntent.getService() returns..." into jb-mr1-dev 
* commit '59cb2cf15c912280b32292c79c2c0e5bfea49b68':
  Revert fix to issue #6880627: PendingIntent.getService() returns...
 2012-10-12 17:46:39 -07:00
Robert Greenwalt
53c04bdd35 Monitor the right interface re VPN 
Must remember the outer interface - undoes a change from a
couple months ago that broke things.

bug:7336302
Change-Id: Ia4f60862c60f3078853e151980e09cbf22a57222
 2012-10-12 17:02:45 -07:00
Dianne Hackborn
861a3b2d4f Revert fix to issue #6880627: PendingIntent.getService() returns... 
...stale intent of force stopped app

Fixing this caused other problems elsewhere that we don't have time
to address at this point.

Fixes issue #7338275: Tapping clock home screen widget doesn't open
alarms anymore

Change-Id: Iedc1fae5f62b6ead28d1895d709591358e5d6634
 2012-10-12 15:25:20 -07:00
Jeff Sharkey
250a90cacf am 49db71e9: am 810df895: Merge "Return ApplicationInfo with requested userId." into jb-mr1-dev 
* commit '49db71e962b8ae17a3698534c800ea7511060dac':
  Return ApplicationInfo with requested userId.
 2012-10-11 17:28:57 -07:00
Jeff Brown
82c1b13e8a am 1984e8c0: am 3da6c219: Merge "Do not launch Somnambulator as a dock app." into jb-mr1-dev 
* commit '1984e8c0965151750c61825c22a27a39bc402471':
  Do not launch Somnambulator as a dock app.
 2012-10-11 17:27:18 -07:00
Jeff Sharkey
49db71e962 am 810df895: Merge "Return ApplicationInfo with requested userId." into jb-mr1-dev 
* commit '810df8951eb4bbe77f150483208f04daadac5dd9':
  Return ApplicationInfo with requested userId.
 2012-10-11 17:25:50 -07:00
Jeff Brown
1984e8c096 am 3da6c219: Merge "Do not launch Somnambulator as a dock app." into jb-mr1-dev 
* commit '3da6c219a8b1acebbfd8a56ee31b5d91d0425dc4':
  Do not launch Somnambulator as a dock app.
 2012-10-11 17:23:55 -07:00
Jeff Sharkey
810df8951e Merge "Return ApplicationInfo with requested userId." into jb-mr1-dev 2012-10-11 17:21:23 -07:00
Jeff Brown
3da6c219a8 Merge "Do not launch Somnambulator as a dock app." into jb-mr1-dev 2012-10-11 17:17:06 -07:00
Winson Chung
dffd302f7d am a58800d1: am 4cce397c: Merge "Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)" into jb-mr1-dev 
* commit 'a58800d153f2a3db963ccbf9347eeccf855ed421':
  Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)
 2012-10-11 17:13:17 -07:00
Jeff Brown
15aa543a58 am 65d8433f: am 2e21bdbe: Merge "Ensure MediaRouter correctly handles renamed Wifi displays." into jb-mr1-dev 
* commit '65d8433f7be3310bd7847fc5521cbe8fd27acc0a':
  Ensure MediaRouter correctly handles renamed Wifi displays.
 2012-10-11 17:13:12 -07:00
Jeff Brown
44877a16e7 am 35499475: am 17026864: Merge "Ensure Binder in-calls to UiModeManagerService are guarded." into jb-mr1-dev 
* commit '35499475d238b6f4f5a07fd59dcddc4bc391f0d8':
  Ensure Binder in-calls to UiModeManagerService are guarded.
 2012-10-11 17:13:08 -07:00
Craig Mautner
567f47b8aa am a37994b2: am 46fb9e9f: Merge "Check for apps closing and restore mExiting test." into jb-mr1-dev 
* commit 'a37994b2b4e2fe02c93c40699442c7a13052c57c':
  Check for apps closing and restore mExiting test.
 2012-10-11 17:13:03 -07:00
Winson Chung
ef36a54942 am f0a8045e: am ee0d8deb: Merge "Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)" into jb-mr1-dev 
* commit 'f0a8045e727e9bff08b4890521912afc6564a895':
  Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)
 2012-10-11 17:12:26 -07:00