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

205893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
33e1d376eb Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev 2015-10-22 00:46:03 +00:00
Dianne Hackborn
ca8e4ce5fc 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
 2015-10-22 00:45:44 +00:00
Dianne Hackborn
75c2993c91 Merge "Hopefully fix issue #25153459: Sandboxed_process1 thrashing" into mnc-dr-dev 
am: 676534e008

* commit '676534e00805e8102ea1458eba2b2cab1dbe7b3d':
  Hopefully fix issue #25153459: Sandboxed_process1 thrashing
 2015-10-22 00:40:35 +00:00
Dianne Hackborn
676534e008 Merge "Hopefully fix issue #25153459: Sandboxed_process1 thrashing" into mnc-dr-dev 2015-10-22 00:37:33 +00:00
Adrian Roos
ab3f972403 Track ashmem memory usage in Parcel 
Bug: 25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
(cherry picked from commit 4701a496a5477a7de01fbc9eaf4af9812f83770c)
 2015-10-22 00:31:47 +00:00
Dianne Hackborn
865907db09 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
 2015-10-21 17:15:37 -07:00
Lorenzo Colitti
d542705066 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
 2015-10-22 08:33:45 +09:00
Daniel Sandler
f7284546d9 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.
 2015-10-21 23:24:36 +00:00
Daniel Sandler
b4aa8b0c5b 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.
 2015-10-21 23:18:54 +00:00
Daniel Sandler
cb10c09f0a Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev 2015-10-21 23:14:50 +00:00
Dan Sandler
8fd25bf771 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
 2015-10-21 15:42:48 -07:00
Adam Powell
f998b602bb 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
 2015-10-21 20:54:26 +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
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
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
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
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
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
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
c55ea66ef2 Import translations. DO NOT MERGE 
Change-Id: I4be0631da01ad34daf596e7634630fbd2efae90e
Auto-generated-cl: translation import
 2015-10-21 10:19:50 -07:00
Geoff Mendal
a01cf41054 Import translations. DO NOT MERGE 
Change-Id: I167d766a2f76a3b6b4b121abddf1f874103a378a
Auto-generated-cl: translation import
 2015-10-21 10:16:37 -07:00
Geoff Mendal
ea6ea27ba6 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: a73a642bfe  -s ours

* commit 'a73a642bfedd0a2fe0854329081354869bf70039':
  Import translations. DO NOT MERGE
 2015-10-21 17:07:21 +00:00
Geoff Mendal
1622b4459a Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev 2015-10-21 17:06:27 +00:00
Geoff Mendal
c6fe063ddf Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev 
am: 84ab40cab2

* commit '84ab40cab243ac76a83c3d15478699998ba68236':
  Import translations. DO NOT MERGE
 2015-10-21 17:06:03 +00:00
Geoff Mendal
899d016e89 Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev 2015-10-21 17:05:16 +00:00
Geoff Mendal
96b250771e Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8ba1cdd946 -s ours 
am: 762ce0fc44  -s ours

* commit '762ce0fc448ebd41225ef0600fb5d258de434de7':
  Import translations. DO NOT MERGE
 2015-10-21 17:04:43 +00:00
Geoff Mendal
b9315af10d Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev 
am: 84ab40cab2

* commit '84ab40cab243ac76a83c3d15478699998ba68236':
  Import translations. DO NOT MERGE
 2015-10-21 17:04:18 +00:00
Geoff Mendal
fc7130c913 Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev 2015-10-21 17:04:07 +00:00
Geoff Mendal
be8fe13d12 Import translations. DO NOT MERGE 
Change-Id: Ie4b7d4378ff46c26fa5da8449fca10274beef157
Auto-generated-cl: translation import
 2015-10-21 10:03:57 -07:00