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

3668 Commits

Author SHA1 Message Date
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
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
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
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
Adam Lesinski
430f5680b6 Merge "Add Configuration changes to UsageStats" into lmp-dev 2014-09-04 20:35:51 +00: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
dcashman
977c5bec52 Merge "Add upgrade KeySets check to permission pruning on install." into lmp-dev 2014-09-04 18:39:35 +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
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
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
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
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
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
Christopher Tate
b541f09be3 Merge "Fix crash in KeySet dump" into lmp-dev 2014-09-03 23:33:05 +00:00
Christopher Tate
6441bc7e53 Fix crash in KeySet dump 
This was unfortunately DOSing some important parts of the Package
Manager's dumpsys output.

Change-Id: I228f23e8e26820b40a8d8772cd5f5b04ee8317d9
 2014-09-03 16:11:31 -07:00
Yuncheol Heo
aa6a67a3e1 Merge "Invoke the callback only when DeviceInfo is available." into lmp-dev 2014-09-03 22:41:43 +00:00
Marco Fucci
8364885a7d Merge "Disconnect TrustAgent when not active." into lmp-dev 2014-09-03 20:39:05 +00:00
Julian Odell
6c25708eb5 Merge "Bug 17262099: MMS API changes (multi-project)." into lmp-dev 2014-09-03 20:20:34 +00:00
Julian Odell
31ef14d4f0 Bug 17262099: MMS API changes (multi-project). 
Move MMS api to using content provider rather than byte[] to pass MMS message contents.
Rebased and merged into TOT.

Change-Id: I3509b2774b1cb30a1c8100bb25d283140c963b6b
 2014-09-03 13:11:56 -07:00
Brian Carlstrom
e7a2138635 Merge "Restrict lazy dexopt to eng builds only" into lmp-dev 2014-09-03 20:02:42 +00:00
Marco Fucci
4e68f11672 Disconnect TrustAgent when not active. 
Bug: 17191952
Change-Id: I470261f659a573400b2eb1421eeb953c87e58b66
 2014-09-03 12:24:22 -07:00
Paul Jensen
1f0ce33821 Merge "Use alarm rather than delayed message to end lingering." into lmp-dev 2014-09-03 19:08:16 +00:00
Brian Carlstrom
230561eef4 Restrict lazy dexopt to eng builds only 
Bug: 16696554
Change-Id: I56bb63ce534842994a70df6b09843b4e3153c845
 2014-09-03 11:59:38 -07:00
Matthew Williams
61dd95f7ba am 3e3a7489: am f390c6ac: Merge "Add timeout when waiting to bind to JobService" into lmp-dev 
* commit '3e3a7489f074b5f2234d32499cdf229da6562d46':
  Add timeout when waiting to bind to JobService
 2014-09-03 18:14:26 +00:00
Jason Monk
37a5bd8be8 am 874fff78: am b0b16c1e: Merge "Add lock task checking to moving tasks to back" into lmp-dev 
* commit '874fff781a60f77b7df030d932c4fb340086368d':
  Add lock task checking to moving tasks to back
 2014-09-03 18:01:30 +00:00
Matthew Williams
5bdc16974a Merge "Add timeout when waiting to bind to JobService" into lmp-dev 2014-09-03 17:49:07 +00:00
Craig Mautner
4f321d86a5 am d1a438b3: am f17528b5: Merge "Unconditionally move stack to front." into lmp-dev 
* commit 'd1a438b37c01b8b39c9073db3649fb6221027c61':
  Unconditionally move stack to front.
 2014-09-03 17:48:18 +00:00
Matthew Williams
75fc5258b7 Add timeout when waiting to bind to JobService 
BUG: 17322886

bindService() to an invalid service might never actually result in
onServiceConnected being called , for e.g. if the client service doesn't
actually implement JobService. This wastes an execution slot as we end
up waiting forever.

Also made the javadocs clearer for the JobScheduler class.

Change-Id: Ie15ebbe18c0b7579f2ab77dd46428d354ef632c3
 2014-09-03 10:47:27 -07:00
Jason Monk
327f7ebc01 Merge "Add lock task checking to moving tasks to back" into lmp-dev 2014-09-03 17:41:41 +00:00
Craig Mautner
db606d2b28 Merge "Unconditionally move stack to front." into lmp-dev 2014-09-03 17:35:19 +00:00
Jason Monk
a7a61594df Add lock task checking to moving tasks to back 
Chrome seems to use this method of moving itself to the back on
back presses, causing it to escape lock task mode.

Bug: 17365048
Change-Id: I2e8bc614f771951ed96cfc36f9789d12b1742e70
 2014-09-03 13:17:05 -04:00
Craig Mautner
02a4aa261c Unconditionally move stack to front. 
Recents was depending on using moveTaskToFront() to also move the
task's stack to the front. But that only works if the task is
actually in the stack because moveTaskToFront() doesn't do the
stack movement if the task is no longer in the stack. This change
calls ActivityStack.moveToFront() in addition to moveTaskToFront().

Fixes bug 17361027.

Also logs callingUid when starting an activity.

Change-Id: I023f956bafae00f45c58757ff5707ce520f02b55
 2014-09-03 10:03:57 -07:00