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

20303 Commits

Author SHA1 Message Date
Andreas Gampe
79de4de3a4 Merge "resolved conflicts for merge of 82ad9ec3 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 2014-09-04 23:17:12 +00:00
Andreas Gampe
dc84c6ca86 resolved conflicts for merge of 82ad9ec3 to lmp-dev-plus-aosp 
Change-Id: I7ae05c4f1b072906932a9ed47bdbad881b8e0d37
 2014-09-04 16:15:52 -07:00
Jeff Sharkey
6de676ca84 am daf82380: am 8fcdda89: Merge "Hold package cleaning until system is ready." into lmp-dev 
* commit 'daf823800795d25629372cd5068d9340a97ed841':
  Hold package cleaning until system is ready.
 2014-09-04 23:04:26 +00:00
Amith Yamasani
0b6ce453a2 am 4a94107f: am 3971e42e: Merge "Fix crash if package setting is not populated yet" into lmp-dev 
* commit '4a94107f50d77cc634bb7e931a25ce9ab6b263df':
  Fix crash if package setting is not populated yet
 2014-09-04 23:04:21 +00:00
Jeff Sharkey
fd12f4c9e4 Merge "Hold package cleaning until system is ready." into lmp-dev 2014-09-04 22:49:17 +00:00
Amith Yamasani
7767df3c9c Merge "Fix crash if package setting is not populated yet" into lmp-dev 2014-09-04 22:47:51 +00:00
Dianne Hackborn
2d0368a775 am 33435c99: am 10053171: Merge "Fix issue #17175312: Calendar crashed when tapping on the event notification" into lmp-dev 
* commit '33435c99a5235b07780b59b43ee5eec4810d1535':
  Fix issue #17175312: Calendar crashed when tapping on the event notification
 2014-09-04 22:02:03 +00:00
Andreas Gampe
82ad9ec3d1 am 523afd15: Merge "Frameworks/base: Add native bridge post-fork initialization" 
* commit '523afd157be99ddce8c0f643caceb9db4a9227bb':
  Frameworks/base: Add native bridge post-fork initialization
 2014-09-04 21:55:34 +00:00
Dianne Hackborn
c50e7e8477 Merge "Fix issue #17175312: Calendar crashed when tapping on the event notification" into lmp-dev 2014-09-04 21:40:31 +00:00
Craig Mautner
54dee06570 am ae433669: am ac8731f9: Merge "Eliminate deadlock by deferring wipe data call" into lmp-dev 
* commit 'ae43366952e7811c62684878f8f160c44a8454fa':
  Eliminate deadlock by deferring wipe data call
 2014-09-04 21:16:56 +00:00
Adam Lesinski
32962bbccf am 9d54107e: am 0c0fcce6: Merge "Add Configuration changes to UsageStats" into lmp-dev 
* commit '9d54107ef3aa5e31fe96a7465fbb9816e2f747d7':
  Add Configuration changes to UsageStats
 2014-09-04 21:04:37 +00:00
Amith Yamasani
43789f5614 Fix crash if package setting is not populated yet 
Bug: 17388687
Change-Id: I441ec37396a3b725a79b933a182c63fbe52d5646
 2014-09-04 14:00:49 -07:00
Craig Mautner
127343cb46 Merge "Eliminate deadlock by deferring wipe data call" into lmp-dev 2014-09-04 20:41:39 +00:00
Adam Lesinski
430f5680b6 Merge "Add Configuration changes to UsageStats" into lmp-dev 2014-09-04 20:35:51 +00:00
Craig Mautner
66eb521833 Eliminate deadlock by deferring wipe data call 
The call to RecoverySystem.rebootWipeUserData() was made while
holding the lock to DevicePolicyManagerService. But it blocks
waiting for system_process' main thread to receive the ordered
broadcast complete callback. It won't receive that callback
because Keyguard is running on the main thread and is concurrently
blocked on DevicePolicyManagerService.

By moving the call to rebootWipeUserData() out of the synchronized
block the deadlock is eliminated.

Fixes bug 16870054.

Change-Id: I3eb587211e5484859cc9dab7e80e5a1f6c85225d
 2014-09-04 12:56:39 -07:00
Adam Lesinski
7f61e96db7 Add Configuration changes to UsageStats 
Bug:17354208
Change-Id: I9b2f595e51b656607e30e798926cfb7e25134944
 2014-09-04 12:15:32 -07:00
dcashman
c287fb2ffd am d285ab9a: am 0dd7e085: Merge "Add upgrade KeySets check to permission pruning on install." into lmp-dev 
* commit 'd285ab9a7b50bde8f65986139bdc0b30db701395':
  Add upgrade KeySets check to permission pruning on install.
 2014-09-04 18:52:16 +00:00
Svetoslav
82f04551f5 am a211481a: am ca24b463: Merge "Fix collection iteration index." into lmp-dev 
* commit 'a211481a57d4eda2830324b7ae254f2d4e9dcf3d':
  Fix collection iteration index.
 2014-09-04 18:52:11 +00:00
dcashman
977c5bec52 Merge "Add upgrade KeySets check to permission pruning on install." into lmp-dev 2014-09-04 18:39:35 +00:00
Svetoslav
f96f52ea51 Merge "Fix collection iteration index." into lmp-dev 2014-09-04 18:39:02 +00:00
Dianne Hackborn
925e2b3352 Fix issue #17175312: Calendar crashed when tapping on the event notification 
mActivities can be null.

Change-Id: I9cc1a08d19d2c38a4ebaaf0ed2168cfbeeaf3b51
 2014-09-04 11:26:09 -07:00
Svetoslav
298a6c6b29 Fix collection iteration index. 
bug:17387880

Change-Id: Ic637ce8fa2da87d6f21a222bd70bf627953f57e3
 2014-09-04 11:20:25 -07:00
Michael Wright
4bed617911 am 3835c405: am c27c79f1: Merge "Add support for SW_CAMERA_LENS_COVER." into lmp-dev 
* commit '3835c40568592820429b81185a4b9d4b7de34aff':
  Add support for SW_CAMERA_LENS_COVER.
 2014-09-04 18:17:44 +00:00
George Mount
7a4dee660b am 9169d544: am ae572ad4: Merge ""Back" with translucent window now sets ActivityOptions." into lmp-dev 
* commit '9169d544573479d30ff47f303c34cf62e54b37fc':
  "Back" with translucent window now sets ActivityOptions.
 2014-09-04 18:17:35 +00:00
Michael Wright
18aa9f65fd Merge "Add support for SW_CAMERA_LENS_COVER." into lmp-dev 2014-09-04 18:07:00 +00:00
George Mount
0f6c32af06 Merge ""Back" with translucent window now sets ActivityOptions." into lmp-dev 2014-09-04 18:03:52 +00:00
George Mount
9e18397112 "Back" with translucent window now sets ActivityOptions. 
Also made convertToTranslucent set the canvas opacity.

Bug 16215650

Change-Id: Id4325eaed34cda1269d874f239aeb5f6f82c959f
 2014-09-04 11:02:29 -07:00
Chris Wren
0ede908c1d am 4b6f4321: am c95be445: Merge "Honor per-app sensitivity setting." into lmp-dev 
* commit '4b6f432163c4d50a53a64b27e19f6e71b0b33541':
  Honor per-app sensitivity setting.
 2014-09-04 17:57:56 +00:00
Amith Yamasani
8fb6a608ea am 50ddcc0a: am bd1122e6: Merge "Allow adb install to work even if unknown sources is disallowed" into lmp-dev 
* commit '50ddcc0aac6b3156fe0c05b3fd559456e1db4a6f':
  Allow adb install to work even if unknown sources is disallowed
 2014-09-04 17:44:35 +00:00
Chris Wren
0fb810a3fa Merge "Honor per-app sensitivity setting." into lmp-dev 2014-09-04 17:42:18 +00:00
Amith Yamasani
dea8e01122 Merge "Allow adb install to work even if unknown sources is disallowed" into lmp-dev 2014-09-04 17:31:32 +00:00
Amith Yamasani
ece305d585 Allow adb install to work even if unknown sources is disallowed 
adb installs should continue to work for developer usecases,
but PackageInstaller continues to be blocked for sideloading
via the UI - browser, downloads, etc.

Bug: 13760585
Change-Id: I4f8c1445448584c17e5acf77b399579c2643f333
 2014-09-04 09:10:10 -07:00
Chris Wren
3ad4e3a45b Honor per-app sensitivity setting. 
Settings are stored by NotificationManagerService in the policy file,
and are communicated to NotificationListeners via a hidden API on the
RankingMap object.

Bug: 16324353
Change-Id: I2d5cf6782273744cbf9b309dec76780cc0a4c39e
 2014-09-04 11:49:06 -04:00
Kenny Guy
2b4decf074 am 377da54c: am 29ad833b: Merge "Use context for user when calling notifyAsUser" into lmp-dev 
* commit '377da54cfa02194798c81c93c92da42de728da75':
  Use context for user when calling notifyAsUser
 2014-09-04 11:41:34 +00:00
Kenny Guy
4c4e796444 Merge "Use context for user when calling notifyAsUser" into lmp-dev 2014-09-04 11:23:53 +00:00
Brian Carlstrom
e48b6bbe6f am 009a4829: am ffedfd4a: Merge "Ensure that BackgroundDexOptService can still perform dexopt" into lmp-dev 
* commit '009a4829b96194301db9ab690f54adcc9f8f3b99':
  Ensure that BackgroundDexOptService can still perform dexopt
 2014-09-04 05:15:24 +00:00
Brian Carlstrom
f663480ae3 Merge "Ensure that BackgroundDexOptService can still perform dexopt" into lmp-dev 2014-09-04 04:58:26 +00:00
Andreas Gampe
aec67dcc02 Frameworks/base: Add native bridge post-fork initialization 
Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
 2014-09-03 21:38:34 -07:00
Svetoslav
51a862bd13 am 666d5fdc: am d370dcc7: Merge "Clear binder identity when sending window change accessibility events." into lmp-dev 
* commit '666d5fdcff7ef139ce1f6fdcfbe25502cf9defdf':
  Clear binder identity when sending window change accessibility events.
 2014-09-04 00:42:16 +00:00
Christopher Tate
8f597af542 am 675dc869: am e4f0d1c4: Merge "Fix crash in KeySet dump" into lmp-dev 
* commit '675dc869bd73c526cd07e172e0e125e3a5d915f6':
  Fix crash in KeySet dump
 2014-09-04 00:41:37 +00:00
Svetoslav
a8d26e80bd Merge "Clear binder identity when sending window change accessibility events." into lmp-dev 2014-09-04 00:03:44 +00:00
Brian Carlstrom
ebb42e18e8 Ensure that BackgroundDexOptService can still perform dexopt 
Bug: 16696554
Change-Id: Id5877618ec9620112fa31dd69016c060bb26b2a7
 2014-09-03 16:54:42 -07:00
Yuncheol Heo
d3ccc666dc am 618f98a0: am acc7fed7: Merge "Invoke the callback only when DeviceInfo is available." into lmp-dev 
* commit '618f98a0bb1dd845b50b9070aa805dca9ad4f29d':
  Invoke the callback only when DeviceInfo is available.
 2014-09-03 23:48:59 +00:00
Christopher Tate
66f5c4ea04 am d6f62e6c: am 3e0c16fe: Merge "The transport system API needs to manage binder identity" into lmp-dev 
* commit 'd6f62e6cba470235130bd78669e5b74181f8b5d5':
  The transport system API needs to manage binder identity
 2014-09-03 23:47:59 +00:00
Marco Fucci
5f1e190d84 am ab2e803f: am dc6323ce: Merge "Disconnect TrustAgent when not active." into lmp-dev 
* commit 'ab2e803fd6b900c049d692847a138fb701c741c1':
  Disconnect TrustAgent when not active.
 2014-09-03 23:47:22 +00:00
Amith Yamasani
1a48d88f09 am 7202fd15: am f27739f7: Merge "Add some @SystemApi tags for internal user-related APIs" into lmp-dev 
* commit '7202fd15a22c2f36dee702eb04f415d36882ee32':
  Add some @SystemApi tags for internal user-related APIs
 2014-09-03 23:46:53 +00:00
Julian Odell
5383729a25 am 2627e56c: am 45ae7fb1: Merge "Bug 17262099: MMS API changes (multi-project)." into lmp-dev 
* commit '2627e56c900389e374fc6599a09e5eda97dd8b74':
  Bug 17262099: MMS API changes (multi-project).
 2014-09-03 23:46:47 +00:00
Brian Carlstrom
965a23423b am 719da919: am c74dc4b7: Merge "Restrict lazy dexopt to eng builds only" into lmp-dev 
* commit '719da919d21538cc145e372a68955e6b87cf6681':
  Restrict lazy dexopt to eng builds only
 2014-09-03 23:46:35 +00:00
Paul Jensen
71f080f1e8 am 6df10322: am bacfc3d4: Merge "Use alarm rather than delayed message to end lingering." into lmp-dev 
* commit '6df10322461de68fa14363f63d336495f2531f6c':
  Use alarm rather than delayed message to end lingering.
 2014-09-03 23:45:45 +00:00
dcashman
436e264e87 Add upgrade KeySets check to permission pruning on install. 
Bug: 16564805
Change-Id: I80393eec3c6e1e861a9ec2ae27fe37027311948d
 2014-09-03 16:33:27 -07:00