212888 Commits

Author SHA1 Message Date
Todd Kennedy
68457b9cd4 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
2015-10-21 20:52:31 +00:00
Selim Cinek
ae070b96ac 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
2015-10-21 20:52:29 +00:00
Adam Powell
8c7b3e872b 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
2015-10-21 20:47:14 +00:00
Jeff Sharkey
949ea14429 Narrow permission re-granting to specific volume. am: 052366ca4e am: 0b639c78f1
am: 7a6a7ae64d

* commit '7a6a7ae64dea59c0ee3e617c333ec389fcfe911c':
  Narrow permission re-granting to specific volume.
2015-10-21 20:45:22 +00:00
Selim Cinek
f9c4f745e6 Merge "Changing the ordering for heads up notifications" into mnc-dr-dev
am: 688e046bad

* commit '688e046bad87cc722e8571b8f4180604623239a8':
  Changing the ordering for heads up notifications
2015-10-21 20:45:17 +00:00
Todd Kennedy
c9f3b2f54b Merge "Maintain shared user list on OTA" into mnc-dr-dev am: 0cd10ec8cf
am: d12f298da4

* commit 'd12f298da4748321d9023185a4ee09c3324c4673':
  Maintain shared user list on OTA
2015-10-21 20:45:13 +00:00
Adam Powell
b8cfc12c3f Merge "Don't query ChooserTargetService apps that haven't been used recently" into mnc-dr-dev 2015-10-21 20:40:45 +00:00
Selim Cinek
688e046bad Merge "Changing the ordering for heads up notifications" into mnc-dr-dev 2015-10-21 20:39:28 +00:00
Jeff Sharkey
7a6a7ae64d Narrow permission re-granting to specific volume. am: 052366ca4e
am: 0b639c78f1

* commit '0b639c78f112252b93314f016b0e1ed1abafc4e3':
  Narrow permission re-granting to specific volume.
2015-10-21 20:38:29 +00:00
Todd Kennedy
d12f298da4 Merge "Maintain shared user list on OTA" into mnc-dr-dev
am: 0cd10ec8cf

* commit '0cd10ec8cf7a896bbdfc0639bf5f9c663c46edbb':
  Maintain shared user list on OTA
2015-10-21 20:38:28 +00:00
Todd Kennedy
0cd10ec8cf Merge "Maintain shared user list on OTA" into mnc-dr-dev 2015-10-21 20:33:31 +00:00
Jeff Sharkey
0b639c78f1 Narrow permission re-granting to specific volume.
am: 052366ca4e

* commit '052366ca4e6138b583d08535bd1837deb7cd58d0':
  Narrow permission re-granting to specific volume.
2015-10-21 20:32:42 +00:00
Todd Kennedy
68f6715bb2 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
2015-10-21 13:22:01 -07:00
Adam Powell
3a09c52914 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
2015-10-21 13:21:28 -07:00
Anthony Hugh
2b76beebac 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
2015-10-21 19:08:48 +00:00
Anthony Hugh
2cd707ef13 Merge "Watch dialer should have phone permission fixed" into cw-e-dev
am: 52c6f9ecb3

* commit '52c6f9ecb3b5c49a16f493f9e1111d1c10a48bd7':
  Watch dialer should have phone permission fixed
2015-10-21 18:59:00 +00:00
Anthony Hugh
52c6f9ecb3 Merge "Watch dialer should have phone permission fixed" into cw-e-dev 2015-10-21 18:52:51 +00:00
Anthony Hugh
90814f0006 Give watch Home app location permissions by default
BUG: 24973857
Change-Id: Ia2758a1822791fb89e6e1f6f20daba9e93cf1794
2015-10-21 11:41:34 -07:00
Anthony Hugh
d4539926a3 Watch dialer should have phone permission fixed
Watch dialer should have phone permission as fixed.

BUG: 24976862
Change-Id: I8bbc63ab0d7dfb2e38eec641681ac9aacae330a0
2015-10-21 11:39:35 -07:00
Nathan Harold
5d1429e0dd Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Bug: 23979591
Change-Id: I16ffa7666fdf0eb081bb1bafa57ebd384d7c3fdf
2015-10-21 11:32:51 -07:00
Geoff Mendal
a638d421ec 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
2015-10-21 18:32:18 +00:00
Geoff Mendal
39eb16c482 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
2015-10-21 18:30:36 +00:00
Geoff Mendal
f0e4b99bd4 Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 255103a79f  -s ours

* commit '255103a79f1ffd4e7511c7281618404dcc06a4ba':
  Import translations. DO NOT MERGE
2015-10-21 18:24:03 +00:00
Geoff Mendal
eb92dc26f3 Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 457d7bb5ab  -s ours

* commit '457d7bb5abec387076c5c28438a4ecca7bc95bd4':
  Import translations. DO NOT MERGE
2015-10-21 18:22:43 +00:00
Geoff Mendal
dbc1d73ffc 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
2015-10-21 18:17:22 +00:00
Geoff Mendal
48bde67af0 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
2015-10-21 18:16:04 +00:00
Geoff Mendal
ee9e812984 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 7c6d61e8eb -s ours
am: 596e71a3d4  -s ours

* commit '596e71a3d45b4a968cc8205953ccf5454b6a42d3':
  Import translations. DO NOT MERGE
2015-10-21 18:13:20 +00:00
Geoff Mendal
255103a79f Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 18:07:42 +00:00
Geoff Mendal
457d7bb5ab Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 18:07:12 +00:00
Tao Bao
db33bfc2a9 Merge "Clean up the uncrypted OTA package on bootup." am: 5d562d4d2f
am: ac140e7f76

* commit 'ac140e7f7690979378897546e7934381f62922ab':
  Clean up the uncrypted OTA package on bootup.
2015-10-21 18:05:18 +00:00
Geoff Mendal
93e157a883 Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 9e30c4b406  -s ours

* commit '9e30c4b4062296bd1eb918d20b6f28032644d820':
  Import translations. DO NOT MERGE
2015-10-21 18:01:40 +00:00
Geoff Mendal
71829e47ae Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 6e66ac8e66  -s ours

* commit '6e66ac8e6624d818ce8675ecc74b05452103bb22':
  Import translations. DO NOT MERGE
2015-10-21 18:00:18 +00:00
Geoff Mendal
596e71a3d4 Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 7c6d61e8eb  -s ours

* commit '7c6d61e8eb9bfb27a038f48d2719c87bd6022e79':
  Import translations. DO NOT MERGE
2015-10-21 17:58:36 +00:00
Geoff Mendal
9e30c4b406 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 17:56:23 +00:00
Geoff Mendal
6e66ac8e66 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 17:55:04 +00:00
Geoff Mendal
7c6d61e8eb Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 17:52:10 +00:00
Tao Bao
ac140e7f76 Merge "Clean up the uncrypted OTA package on bootup."
am: 5d562d4d2f

* commit '5d562d4d2fe5697468e5b93b183ed8ea42e115a2':
  Clean up the uncrypted OTA package on bootup.
2015-10-21 17:51:53 +00:00
Jeff Sharkey
052366ca4e Narrow permission re-granting to specific volume.
When mounting a storage volume after an SDK upgrade, the platform
grants install permissions requested by apps.  This patch fixes a
bug that was causing us to re-grant permissions for all installed
apps; we now narrow the granting to just the storage volume of
interest.

Also fixes a bug where scanning of internal ASECs would bump the
VersionInfo of the legacy apps-on-SD volume.

There is still a bug here around internal ASECs not being considered
for re-grants, but that needs to be fixed in a more invasive CL that
creates a separate VersionInfo.  In addition, internal ASECs (also
known as forward locked apps) have been deprecated for some time.

Bug: 24583803
Change-Id: I9115fd484ec083bc10a970f5f612860d5a53e520
2015-10-21 10:42:14 -07:00
Geoff Mendal
a2c9a412f4 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 2015-10-21 17:30:49 +00:00
Geoff Mendal
7dd2ea1f4e Merge "Import translations. DO NOT MERGE" into cw-e-dev am: a73a642bfe -s ours
am: ea6ea27ba6  -s ours

* commit 'ea6ea27ba6ee2f89ab768a23ca036d5cc383c47f':
  Import translations. DO NOT MERGE
2015-10-21 17:30:24 +00:00
Tao Bao
5d562d4d2f Merge "Clean up the uncrypted OTA package on bootup." 2015-10-21 17:30:04 +00:00
Geoff Mendal
f4bce5229e 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 2015-10-21 17:29:54 +00:00
Geoff Mendal
666af89eac Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
am: 1622b4459a

* commit '1622b4459aea71f71d4c34087c61f0fdc40dbab1':
2015-10-21 17:29:26 +00:00
Geoff Mendal
e926056eb1 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: a73a642bfe -s ours
am: ea6ea27ba6  -s ours

* commit 'ea6ea27ba6ee2f89ab768a23ca036d5cc383c47f':
  Import translations. DO NOT MERGE
2015-10-21 17:28:56 +00:00
Geoff Mendal
3d6ca8017d 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 2015-10-21 17:28:55 +00:00
Geoff Mendal
86f2721e96 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: 84ab40cab2
am: c6fe063ddf

* commit 'c6fe063ddf113a5551f3bfe6a1f1631c775d9cc6':
  Import translations. DO NOT MERGE
2015-10-21 17:27:54 +00:00
Geoff Mendal
64cd7c6d1e Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
am: 1622b4459a

* commit '1622b4459aea71f71d4c34087c61f0fdc40dbab1':
2015-10-21 17:27:30 +00:00
Geoff Mendal
221e22d027 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 2015-10-21 17:26:58 +00:00
Geoff Mendal
129ae4421d Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
am: 899d016e89

* commit '899d016e89daeccd8f1f5b15a5222f801570f283':
2015-10-21 17:26:29 +00:00
Geoff Mendal
aca0e50f86 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: 84ab40cab2
am: c6fe063ddf

* commit 'c6fe063ddf113a5551f3bfe6a1f1631c775d9cc6':
  Import translations. DO NOT MERGE
2015-10-21 17:26:14 +00:00