OSDN Git Service
Yoshiki Iguchi [Thu, 22 Oct 2015 07:53:41 +0000 (07:53 +0000)]
Fix crash on calling removeSelection with showing selection handlers am:
9582e15196 am:
6649ee972b am:
6a5bb1534c
am:
fb8343549a
* commit '
fb8343549a65bf65dab0fce6830b1b39ce62ddaa':
Fix crash on calling removeSelection with showing selection handlers
Yoshiki Iguchi [Thu, 22 Oct 2015 07:49:00 +0000 (07:49 +0000)]
Fix crash on calling removeSelection with showing selection handlers am:
9582e15196 am:
6649ee972b
am:
6a5bb1534c
* commit '
6a5bb1534c736c21260c5c488ff58e4d81972f92':
Fix crash on calling removeSelection with showing selection handlers
Yoshiki Iguchi [Thu, 22 Oct 2015 07:44:15 +0000 (07:44 +0000)]
Fix crash on calling removeSelection with showing selection handlers am:
9582e15196
am:
6649ee972b
* commit '
6649ee972b2bfbeca2d664cfd6629810ebbc7ac8':
Fix crash on calling removeSelection with showing selection handlers
Yoshiki Iguchi [Thu, 22 Oct 2015 07:39:17 +0000 (07:39 +0000)]
Fix crash on calling removeSelection with showing selection handlers
am:
9582e15196
* commit '
9582e151964be60457d4abd712857fb1e8a4586d':
Fix crash on calling removeSelection with showing selection handlers
Yoshiki Iguchi [Thu, 15 Oct 2015 04:34:41 +0000 (13:34 +0900)]
Fix crash on calling removeSelection with showing selection handlers
A crash occured on updating after calling removeSelection with showing
selection handlers. This was because some selection-handler code didn't
consider the case the selection index was -1 (-1 means there is no selection).
This patch fixes this crash.
Bug:
23299977
Change-Id: I736d315e073f773aec597522203015205a8da42b
Lorenzo Colitti [Thu, 22 Oct 2015 06:33:09 +0000 (06:33 +0000)]
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev am:
809dcade99 am:
bdc458048a am:
bb8f652372
am:
8ecad265b6
* commit '
8ecad265b6db57f78dd142e974057c91f69489ed':
Reinstate CHANGE_NETWORK_STATE as a normal permission.
Lorenzo Colitti [Thu, 22 Oct 2015 06:28:24 +0000 (06:28 +0000)]
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev am:
809dcade99 am:
bdc458048a
am:
bb8f652372
* commit '
bb8f652372f261edd2083103d4300a9173993706':
Reinstate CHANGE_NETWORK_STATE as a normal permission.
Lorenzo Colitti [Thu, 22 Oct 2015 06:23:23 +0000 (06:23 +0000)]
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev am:
809dcade99
am:
bdc458048a
* commit '
bdc458048abee78a945a26cd13a71245e7d4a2e5':
Reinstate CHANGE_NETWORK_STATE as a normal permission.
Lorenzo Colitti [Thu, 22 Oct 2015 06:18:43 +0000 (06:18 +0000)]
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev
am:
809dcade99
* commit '
809dcade9906001f6aa51a68aa783e20bb1d7c0d':
Reinstate CHANGE_NETWORK_STATE as a normal permission.
Lorenzo Colitti [Thu, 22 Oct 2015 06:15:05 +0000 (06:15 +0000)]
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev
Nathan Harold [Thu, 22 Oct 2015 05:39:02 +0000 (05:39 +0000)]
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo() am:
0dccd12800 am:
64e8bdc476 am:
51692ac260
am:
6f39642389
* commit '
6f39642389d2702125898c401ca9e8881a322fe0':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 05:33:10 +0000 (05:33 +0000)]
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo() am:
0dccd12800 am:
64e8bdc476
am:
51692ac260
* commit '
51692ac260f8acc405ba94e9e83294bb1ef20015':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 05:28:26 +0000 (05:28 +0000)]
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo() am:
0dccd12800
am:
64e8bdc476
* commit '
64e8bdc4760aebf7f8c80ce3384120ed9b01a3ec':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 05:23:34 +0000 (05:23 +0000)]
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
am:
0dccd12800
* commit '
0dccd128001ceff9437f736bd70dfd1986e315d5':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 03:12:10 +0000 (20:12 -0700)]
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
-Fixed doc string
Bug:
23979591
This reverts commit
f7b6474de87fd2eee377dc612c757102cdacc003.
Change-Id: I127f1452f4319a154dd4d962d4a63c84f0833702
Nathan Harold [Thu, 22 Oct 2015 03:13:02 +0000 (03:13 +0000)]
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev am:
42015c4081 am:
5be7dbc88d am:
b129c106bd
am:
ce73642a58
* commit '
ce73642a5804a50468fa9bc928333653948c5549':
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
Nathan Harold [Thu, 22 Oct 2015 03:07:57 +0000 (03:07 +0000)]
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev am:
42015c4081 am:
5be7dbc88d
am:
b129c106bd
* commit '
b129c106bde86b8b290cc25cc39f0fcb9b9b48fb':
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
Nathan Harold [Thu, 22 Oct 2015 03:03:18 +0000 (03:03 +0000)]
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev am:
42015c4081
am:
5be7dbc88d
* commit '
5be7dbc88d0460dfede5373f1204f4645ce99726':
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
Nathan Harold [Thu, 22 Oct 2015 02:58:15 +0000 (02:58 +0000)]
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev
am:
42015c4081
* commit '
42015c4081f9d37d579f0be15e11725cf6cc5fba':
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
Nathan Harold [Thu, 22 Oct 2015 02:54:45 +0000 (02:54 +0000)]
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev
Nathan Harold [Thu, 22 Oct 2015 02:53:57 +0000 (02:53 +0000)]
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
This reverts commit
5d1429e0dd1a13f76dbb354f9e4e415f71956299.
Doc string isn't resolving. Temporarily reverting.
Change-Id: I128b13abcf938c96b24225e373ac0885c24e083e
Daichi Hirono [Thu, 22 Oct 2015 02:23:39 +0000 (02:23 +0000)]
Merge "Support major format code in MtpDocumentsProvider."
Nathan Harold [Thu, 22 Oct 2015 02:18:46 +0000 (02:18 +0000)]
Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am:
f8a4dc4a6f am:
dc9f8fab0f am:
1a3c88a5bf
am:
c3a94cb6c2
* commit '
c3a94cb6c2097ae2b30500a32ecf95b5714bd8c2':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 02:13:54 +0000 (02:13 +0000)]
Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am:
f8a4dc4a6f am:
dc9f8fab0f
am:
1a3c88a5bf
* commit '
1a3c88a5bf8c80d46958830bb6282463c72a4e6b':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 02:08:56 +0000 (02:08 +0000)]
Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am:
f8a4dc4a6f
am:
dc9f8fab0f
* commit '
dc9f8fab0fd9485b22651fe5c7f70961d67d697a':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 02:03:32 +0000 (02:03 +0000)]
Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev
am:
f8a4dc4a6f
* commit '
f8a4dc4a6f8383fc2999ce1292d900912a0da842':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 01:58:37 +0000 (01:58 +0000)]
Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev
Chong Zhang [Wed, 14 Oct 2015 23:50:12 +0000 (16:50 -0700)]
Assign different oom score to visible apps based on layer ordering.
Pass oom score in kernel's full range [-1000,1000] to lmkd directly
bug:
21411311
Change-Id: I0cab2aa46269a716ea613025d3b84fe7d04404bb
Adrian Roos [Thu, 22 Oct 2015 01:10:15 +0000 (01:10 +0000)]
Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev am:
33e1d376eb am:
655c12edb0 am:
fda65d780e
am:
b531762c89
* commit '
b531762c89e45b9ac5c401a2e90f9330bcdf629e':
Track ashmem memory usage in Parcel
Adrian Roos [Thu, 22 Oct 2015 01:02:27 +0000 (01:02 +0000)]
Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev am:
33e1d376eb am:
655c12edb0
am:
fda65d780e
* commit '
fda65d780eea9f696b087deb8d532b87e44877b6':
Track ashmem memory usage in Parcel
Dianne Hackborn [Thu, 22 Oct 2015 00:59:09 +0000 (00:59 +0000)]
Merge "Hopefully fix issue #
25153459: Sandboxed_process1 thrashing" into mnc-dr-dev am:
676534e008 am:
75c2993c91 am:
ca8e4ce5fc
am:
06496d0479
* commit '
06496d04791f46a834a6d101068a1a999762d6a2':
Hopefully fix issue #
25153459: Sandboxed_process1 thrashing
Adrian Roos [Thu, 22 Oct 2015 00:56:26 +0000 (00:56 +0000)]
Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev am:
33e1d376eb
am:
655c12edb0
* commit '
655c12edb0312933249659ab6b23191adcba4fa3':
Track ashmem memory usage in Parcel
Dianne Hackborn [Thu, 22 Oct 2015 00:53:08 +0000 (00:53 +0000)]
Merge "Hopefully fix issue #
25153459: Sandboxed_process1 thrashing" into mnc-dr-dev am:
676534e008 am:
75c2993c91
am:
ca8e4ce5fc
* commit '
ca8e4ce5fc6ff65ef267ca1995876968afe24d8d':
Hopefully fix issue #
25153459: Sandboxed_process1 thrashing
Adrian Roos [Thu, 22 Oct 2015 00:49:52 +0000 (00:49 +0000)]
Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev
am:
33e1d376eb
* commit '
33e1d376ebd643cba5b507d0005b87d49e246bb5':
Track ashmem memory usage in Parcel
Adrian Roos [Thu, 22 Oct 2015 00:46:03 +0000 (00:46 +0000)]
Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev
Dianne Hackborn [Thu, 22 Oct 2015 00:45:44 +0000 (00:45 +0000)]
Merge "Hopefully fix issue #
25153459: Sandboxed_process1 thrashing" into mnc-dr-dev am:
676534e008
am:
75c2993c91
* commit '
75c2993c91e9088572bc0eae6f424717deafc963':
Hopefully fix issue #
25153459: Sandboxed_process1 thrashing
Dianne Hackborn [Thu, 22 Oct 2015 00:40:35 +0000 (00:40 +0000)]
Merge "Hopefully fix issue #
25153459: Sandboxed_process1 thrashing" into mnc-dr-dev
am:
676534e008
* commit '
676534e00805e8102ea1458eba2b2cab1dbe7b3d':
Hopefully fix issue #
25153459: Sandboxed_process1 thrashing
Dianne Hackborn [Thu, 22 Oct 2015 00:37:33 +0000 (00:37 +0000)]
Merge "Hopefully fix issue #
25153459: Sandboxed_process1 thrashing" into mnc-dr-dev
Adrian Roos [Wed, 21 Oct 2015 21:50:38 +0000 (14:50 -0700)]
Track ashmem memory usage in Parcel
Bug:
25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
(cherry picked from commit
4701a496a5477a7de01fbc9eaf4af9812f83770c)
Adrian Roos [Thu, 22 Oct 2015 00:31:17 +0000 (00:31 +0000)]
Merge "Track ashmem memory usage in Parcel"
Dianne Hackborn [Thu, 22 Oct 2015 00:12:53 +0000 (17:12 -0700)]
Hopefully fix issue #
25153459: Sandboxed_process1 thrashing
There is a race where if you unbind to a service before its
process has come up, we would leave the service record active
and keep it running. Fix this by checking the service state
after its process up and proceed to bring it down if it is no
longer needed.
Also added a similar check when restarting a service, just in
case there are other ways we can get into this situation.
And while I am at it, I tweaked the broadcast queue dump output
a bit to hopefully make it a lot easier to figure out how long
it is taking to process broadcasts.
Change-Id: I46b98f1fe394ab8039ea4cc81fb5d3afb6391a31
Adrian Roos [Wed, 21 Oct 2015 21:50:38 +0000 (14:50 -0700)]
Track ashmem memory usage in Parcel
Bug:
25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
Daniel Sandler [Wed, 21 Oct 2015 23:36:07 +0000 (23:36 +0000)]
Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev am:
cb10c09f0a am:
b4aa8b0c5b am:
f7284546d9
am:
f5450e1b33
* commit '
f5450e1b331bb33cf2c831abba3633fb52038cb8':
Delay hiding the cast icon for 3 seconds.
Lorenzo Colitti [Thu, 15 Oct 2015 07:29:00 +0000 (16:29 +0900)]
Reinstate CHANGE_NETWORK_STATE as a normal permission.
This is a partial revert of http://ag/738523 , but not a full
revert because M apps that have gone through the WRITE_SETTINGS
route to obtain permission to change network state should
continue to have permission to do so.
Specifically:
1. Change the protection level of CHANGE_NETWORK_STATE back from
"signature|preinstalled|appop|pre23" to "normal". This allows
apps that declare CHANGE_NETWORK_STATE in their manifest to
acquire it, even if they target the M SDK or above.
2. Change the ConnectivityManager permission checks so that they
first check CHANGE_NETWORK_STATE, and then ask Settings
if the app has the WRITE_SETTINGS runtime permission.
3. Slightly simplify the code in the Settings provider code that
deals specifically with the ability to change network state.
4. Make the ConnectivityService permissions checks use the
ConnectivityManager code to avoid code duplication.
5. Update the ConnectivityManager public Javadoc to list both
CHANGE_NETWORK_STATE and WRITE_SETTINGS.
Bug:
21588539
Bug:
23597341
Change-Id: Ic06a26517c95f9ad94183f6d126fd0de45de346e
Daniel Sandler [Wed, 21 Oct 2015 23:30:29 +0000 (23:30 +0000)]
Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev am:
cb10c09f0a am:
b4aa8b0c5b
am:
f7284546d9
* commit '
f7284546d930583d1f7d6ca50d80bd74be3eeae4':
Delay hiding the cast icon for 3 seconds.
Daniel Sandler [Wed, 21 Oct 2015 23:24:36 +0000 (23:24 +0000)]
Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev am:
cb10c09f0a
am:
b4aa8b0c5b
* commit '
b4aa8b0c5b65d301611ca4c0492b2a9ed67a5a1a':
Delay hiding the cast icon for 3 seconds.
Daniel Sandler [Wed, 21 Oct 2015 23:18:54 +0000 (23:18 +0000)]
Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev
am:
cb10c09f0a
* commit '
cb10c09f0a6c0750d79bf4f681a623fa35f4cef7':
Delay hiding the cast icon for 3 seconds.
Daniel Sandler [Wed, 21 Oct 2015 23:14:50 +0000 (23:14 +0000)]
Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev
Dan Sandler [Tue, 20 Oct 2015 23:01:27 +0000 (16:01 -0700)]
Delay hiding the cast icon for 3 seconds.
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.
Bug:
19121797
Change-Id: I52b69b2029439d42163ead5dc8748889b4f61934
Tyler Gunn [Wed, 21 Oct 2015 21:26:09 +0000 (21:26 +0000)]
Merge "Add extras keys for instant lettering."
Adam Powell [Wed, 21 Oct 2015 21:08:51 +0000 (21:08 +0000)]
Merge "Don\'t query ChooserTargetService apps that haven\'t been used recently" into mnc-dr-dev am:
b8cfc12c3f am:
8c7b3e872b am:
f998b602bb
am:
d6db05e4b1
* commit '
d6db05e4b1ea2410525f2a3d406d24262e06e7e7':
Don't query ChooserTargetService apps that haven't been used recently
Selim Cinek [Wed, 21 Oct 2015 21:07:26 +0000 (21:07 +0000)]
Merge "Changing the ordering for heads up notifications" into mnc-dr-dev am:
688e046bad am:
f9c4f745e6 am:
ae070b96ac
am:
49ebad9e66
* commit '
49ebad9e6613eab93705d10096c1af4539b5e9c9':
Changing the ordering for heads up notifications
Adam Powell [Wed, 21 Oct 2015 21:01:18 +0000 (21:01 +0000)]
Merge "Don\'t query ChooserTargetService apps that haven\'t been used recently" into mnc-dr-dev am:
b8cfc12c3f am:
8c7b3e872b
am:
f998b602bb
* commit '
f998b602bb0145ab7c0a0556795bbaaf69661c74':
Don't query ChooserTargetService apps that haven't been used recently
Todd Kennedy [Wed, 21 Oct 2015 20:59:42 +0000 (20:59 +0000)]
Merge "Maintain shared user list on OTA" into mnc-dr-dev am:
0cd10ec8cf am:
d12f298da4 am:
c9f3b2f54b
am:
68457b9cd4
* commit '
68457b9cd49a695ed50c51eb9c0d0b63fcead737':
Maintain shared user list on OTA
Selim Cinek [Wed, 21 Oct 2015 20:59:42 +0000 (20:59 +0000)]
Merge "Changing the ordering for heads up notifications" into mnc-dr-dev am:
688e046bad am:
f9c4f745e6
am:
ae070b96ac
* commit '
ae070b96acc23e1e6c4ca979d72c39e0d91e583a':
Changing the ordering for heads up notifications
Xiaohui Chen [Wed, 21 Oct 2015 18:19:42 +0000 (11:19 -0700)]
Clean up UserHandle.isOwner() in frameworks
Bug:
24869636
Change-Id: Ibebd7d0762f5375ee93ec101e7ab5578769bd9f6
Adam Powell [Wed, 21 Oct 2015 20:54:26 +0000 (20:54 +0000)]
Merge "Don\'t query ChooserTargetService apps that haven\'t been used recently" into mnc-dr-dev am:
b8cfc12c3f
am:
8c7b3e872b
* commit '
8c7b3e872b28fa466cd1c0e314771871a15104ad':
Don't query ChooserTargetService apps that haven't been used recently
Todd Kennedy [Wed, 21 Oct 2015 20:52:31 +0000 (20:52 +0000)]
Merge "Maintain shared user list on OTA" into mnc-dr-dev am:
0cd10ec8cf am:
d12f298da4
am:
c9f3b2f54b
* commit '
c9f3b2f54b042df97a806ad114f21cca26a8341a':
Maintain shared user list on OTA
Selim Cinek [Wed, 21 Oct 2015 20:52:29 +0000 (20:52 +0000)]
Merge "Changing the ordering for heads up notifications" into mnc-dr-dev am:
688e046bad
am:
f9c4f745e6
* commit '
f9c4f745e6a4e8586baab085dc86b9b2b187f48a':
Changing the ordering for heads up notifications
Jeff Sharkey [Wed, 21 Oct 2015 20:52:29 +0000 (20:52 +0000)]
Narrow permission re-granting to specific volume. am:
052366ca4e am:
0b639c78f1 am:
7a6a7ae64d
am:
949ea14429
* commit '
949ea1442925cbbce72ccff1b0ffc7c7f876e97b':
Narrow permission re-granting to specific volume.
Adam Powell [Wed, 21 Oct 2015 20:47:14 +0000 (20:47 +0000)]
Merge "Don\'t query ChooserTargetService apps that haven\'t been used recently" into mnc-dr-dev
am:
b8cfc12c3f
* commit '
b8cfc12c3f0b83e9d00b1f324be4ff5c977645ce':
Don't query ChooserTargetService apps that haven't been used recently
Jeff Sharkey [Wed, 21 Oct 2015 20:45:22 +0000 (20:45 +0000)]
Narrow permission re-granting to specific volume. am:
052366ca4e am:
0b639c78f1
am:
7a6a7ae64d
* commit '
7a6a7ae64dea59c0ee3e617c333ec389fcfe911c':
Narrow permission re-granting to specific volume.
Selim Cinek [Wed, 21 Oct 2015 20:45:17 +0000 (20:45 +0000)]
Merge "Changing the ordering for heads up notifications" into mnc-dr-dev
am:
688e046bad
* commit '
688e046bad87cc722e8571b8f4180604623239a8':
Changing the ordering for heads up notifications
Todd Kennedy [Wed, 21 Oct 2015 20:45:13 +0000 (20:45 +0000)]
Merge "Maintain shared user list on OTA" into mnc-dr-dev am:
0cd10ec8cf
am:
d12f298da4
* commit '
d12f298da4748321d9023185a4ee09c3324c4673':
Maintain shared user list on OTA
Filip Gruszczynski [Wed, 21 Oct 2015 20:42:39 +0000 (20:42 +0000)]
Merge "Make stack crop be aware of the big surface during resizing."
Adam Powell [Wed, 21 Oct 2015 20:40:45 +0000 (20:40 +0000)]
Merge "Don't query ChooserTargetService apps that haven't been used recently" into mnc-dr-dev
Selim Cinek [Wed, 21 Oct 2015 20:39:28 +0000 (20:39 +0000)]
Merge "Changing the ordering for heads up notifications" into mnc-dr-dev
Jeff Sharkey [Wed, 21 Oct 2015 20:38:29 +0000 (20:38 +0000)]
Narrow permission re-granting to specific volume. am:
052366ca4e
am:
0b639c78f1
* commit '
0b639c78f112252b93314f016b0e1ed1abafc4e3':
Narrow permission re-granting to specific volume.
Todd Kennedy [Wed, 21 Oct 2015 20:38:28 +0000 (20:38 +0000)]
Merge "Maintain shared user list on OTA" into mnc-dr-dev
am:
0cd10ec8cf
* commit '
0cd10ec8cf7a896bbdfc0639bf5f9c663c46edbb':
Maintain shared user list on OTA
Todd Kennedy [Wed, 21 Oct 2015 20:33:31 +0000 (20:33 +0000)]
Merge "Maintain shared user list on OTA" into mnc-dr-dev
Jeff Sharkey [Wed, 21 Oct 2015 20:32:42 +0000 (20:32 +0000)]
Narrow permission re-granting to specific volume.
am:
052366ca4e
* commit '
052366ca4e6138b583d08535bd1837deb7cd58d0':
Narrow permission re-granting to specific volume.
Todd Kennedy [Wed, 21 Oct 2015 20:09:10 +0000 (13:09 -0700)]
Maintain shared user list on OTA
When a package is removed during an OTA, we weren't removing it from the
shared user list. This means anyone asking for the packages for a shared
UID would continue to see the old package.
Bug:
24906701
Change-Id: Ifb6d64195e6b8af7454e19591611af66a40cbd10
Adam Powell [Wed, 21 Oct 2015 20:21:28 +0000 (13:21 -0700)]
Don't query ChooserTargetService apps that haven't been used recently
Resolver/ChooserActivity sort apps based on usage factors for the last
two weeks. A score of zero means no usage data within that timeframe.
For system health and UI relevance, don't bother even waking up apps
that have zero scores.
Bug
25126166
Change-Id: Iae34a9667eb1985d6fe986670f3fb3f1177576da
Filip Gruszczynski [Wed, 21 Oct 2015 20:19:10 +0000 (13:19 -0700)]
Make stack crop be aware of the big surface during resizing.
When resizing we are using big surface, so we can't depend on the
window frame to determine how to crop it to its surface.
Change-Id: I6aaa32433c5db59dfe7ccb930a0485688e6e2503
Jun Mukai [Wed, 7 Oct 2015 07:58:09 +0000 (16:58 +0900)]
Use invisible icon for POINTER_ICON_STYLE_NULL.
Change-Id: I10d35bdc4da4817d769eb164e6f15e4618670a05
Anthony Hugh [Wed, 21 Oct 2015 19:16:30 +0000 (19:16 +0000)]
Merge "Watch dialer should have phone permission fixed" into cw-e-dev am:
52c6f9ecb3 am:
2cd707ef13
am:
2b76beebac
* commit '
2b76beebacacc438478b617020ed7e3a71c5f6fc':
Watch dialer should have phone permission fixed
Anthony Hugh [Wed, 21 Oct 2015 19:08:48 +0000 (19:08 +0000)]
Merge "Watch dialer should have phone permission fixed" into cw-e-dev am:
52c6f9ecb3
am:
2cd707ef13
* commit '
2cd707ef137aedfc3d0bc048a21e122842cce8f6':
Watch dialer should have phone permission fixed
Anthony Hugh [Wed, 21 Oct 2015 18:59:00 +0000 (18:59 +0000)]
Merge "Watch dialer should have phone permission fixed" into cw-e-dev
am:
52c6f9ecb3
* commit '
52c6f9ecb3b5c49a16f493f9e1111d1c10a48bd7':
Watch dialer should have phone permission fixed
Anthony Hugh [Wed, 21 Oct 2015 18:52:51 +0000 (18:52 +0000)]
Merge "Watch dialer should have phone permission fixed" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 18:42:59 +0000 (18:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
255103a79f -s ours am:
f0e4b99bd4 -s ours
am:
a638d421ec -s ours
* commit '
a638d421ec27b2fbeff6ced557ed0b804255caf2':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 18:41:40 +0000 (18:41 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
457d7bb5ab -s ours am:
eb92dc26f3 -s ours
am:
39eb16c482 -s ours
* commit '
39eb16c482d10cec29ef0849541b1062c9444ff6':
Import translations. DO NOT MERGE
Anthony Hugh [Mon, 19 Oct 2015 20:42:26 +0000 (13:42 -0700)]
Watch dialer should have phone permission fixed
Watch dialer should have phone permission as fixed.
BUG:
24976862
Change-Id: I8bbc63ab0d7dfb2e38eec641681ac9aacae330a0
Nathan Harold [Wed, 21 Oct 2015 17:51:02 +0000 (10:51 -0700)]
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Bug:
23979591
Change-Id: I16ffa7666fdf0eb081bb1bafa57ebd384d7c3fdf
Geoff Mendal [Wed, 21 Oct 2015 18:32:18 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
255103a79f -s ours
am:
f0e4b99bd4 -s ours
* commit '
f0e4b99bd4f4630225f1358e50b1f954130c58fe':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 18:30:36 +0000 (18:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
457d7bb5ab -s ours
am:
eb92dc26f3 -s ours
* commit '
eb92dc26f3a54adec12d952bae25c7a790c595b7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 18:28:11 +0000 (18:28 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
9e30c4b406 -s ours am:
93e157a883 -s ours
am:
dbc1d73ffc -s ours
* commit '
dbc1d73ffc5d65e9e0de68715da205598dd19860':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 18:26:49 +0000 (18:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
6e66ac8e66 -s ours am:
71829e47ae -s ours
am:
48bde67af0 -s ours
* commit '
48bde67af050c376f716dd0f8d5bb17cd9c7575c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 18:25:53 +0000 (18:25 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Wed, 21 Oct 2015 18:25:06 +0000 (18:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
7c6d61e8eb -s ours am:
596e71a3d4 -s ours
am:
ee9e812984 -s ours
* commit '
ee9e81298494b4246ef9c77848d2594f8a34d646':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 18:24:03 +0000 (18:24 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
255103a79f -s ours
* commit '
255103a79f1ffd4e7511c7281618404dcc06a4ba':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 18:23:54 +0000 (18:23 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
7c6d61e8eb -s ours am:
596e71a3d4 -s ours
am:
ee9e812984 -s ours
* commit '
ee9e81298494b4246ef9c77848d2594f8a34d646':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 18:22:43 +0000 (18:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
457d7bb5ab -s ours
* commit '
457d7bb5abec387076c5c28438a4ecca7bc95bd4':
Import translations. DO NOT MERGE
Tao Bao [Wed, 21 Oct 2015 18:22:42 +0000 (18:22 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Tao Bao [Wed, 21 Oct 2015 18:22:13 +0000 (18:22 +0000)]
Merge "Clean up the uncrypted OTA package on bootup." am:
5d562d4d2f am:
ac140e7f76
am:
db33bfc2a9
* commit '
db33bfc2a96c38eba5b67c82cb4fee69c52b80ad':
Clean up the uncrypted OTA package on bootup.
Geoff Mendal [Wed, 21 Oct 2015 18:20:47 +0000 (18:20 +0000)]
Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
am:
a2c9a412f4
* commit '
a2c9a412f463da91bc3ae35c5ea60d8ba920a104':
Geoff Mendal [Wed, 21 Oct 2015 18:17:39 +0000 (18:17 +0000)]
Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
am:
a2c9a412f4
* commit '
a2c9a412f463da91bc3ae35c5ea60d8ba920a104':
Geoff Mendal [Wed, 21 Oct 2015 18:17:22 +0000 (18:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
9e30c4b406 -s ours
am:
93e157a883 -s ours
* commit '
93e157a883e3c8ab5f4ff434cb33a6c71ad01a94':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 18:16:22 +0000 (18:16 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
a73a642bfe -s ours am:
ea6ea27ba6 -s ours
am:
7dd2ea1f4e -s ours
* commit '
7dd2ea1f4ee9f2df25b3705ff5273076a948b6a1':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 18:16:04 +0000 (18:16 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
6e66ac8e66 -s ours
am:
71829e47ae -s ours
* commit '
71829e47aec78ef2a3cc99649c99b7f08af590d9':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 18:15:27 +0000 (18:15 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base