201862 Commits

Author SHA1 Message Date
Ian Pedowitz
b402735fc0 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
am: 09fd4ecf90

* commit '09fd4ecf90c7ae2536a6848e8c88c4878e0e0c24':
  Revert "Track ashmem memory usage in Parcel"
2015-10-22 22:32:37 +00:00
Ian Pedowitz
09fd4ecf90 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev 2015-10-22 22:26:32 +00:00
Ian Pedowitz
e2adb2cf0f Revert "Track ashmem memory usage in Parcel"
This reverts commit ab3f9724035046d65124a72db2a09c824b3d5c67.

Bug: 25169267
Bug: 25191602
Bug: 25004154
Change-Id: Ic51e62515273e4687359dfd9ff770a4d06c0c667
2015-10-22 22:09:04 +00:00
Nicolas Prévot
f31628f58b Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev
am: 6666b29cf7

* commit '6666b29cf7c5ddaeae3d66606a9982f7c5cc8686':
  Don't resolve cross-profile app links without intent picker.
2015-10-22 20:35:19 +00:00
Nicolas Prévot
6666b29cf7 Merge "Don't resolve cross-profile app links without intent picker." into mnc-dr-dev 2015-10-22 20:29:51 +00:00
Dmitry Torokhov
d3eee7c410 SystemUI: fix automatic pairing of BT keyboards
am: 79f00cf06f

* commit '79f00cf06f5e70047d73b48d20910b967353b075':
  SystemUI: fix automatic pairing of BT keyboards
2015-10-22 18:13:36 +00:00
Anthony Hugh
0a3270e00a Merge "Give watch Home app location permissions by default" into cw-e-dev 2015-10-22 17:22:21 +00:00
Dmitry Torokhov
79f00cf06f SystemUI: fix automatic pairing of BT keyboards
After reset (docking) Pixel C Keyboard that was previously paired with
a device goes into so-called non-discoverable mode, where it will
establish connection only with device that it has connected before. When
scanning for available devices we need to wait till the keyboard starts
advertising itself as discoverable, and only then try to pair.

Also, let's flush the device cache when we attach the base to make sure
the device that we seen before and cached again in the right state after
reset.

Bug: 24915541
Change-Id: I136c1c4235080a25529b4b1c2b1da9bc18508811
2015-10-22 10:19:32 -07:00
Nicolas Prevot
ff91ef8ed1 Don't resolve cross-profile app links without intent picker.
If ALLOW_CROSS_PROFILE_APP_LINKING has been set:
If there is an app with status always across profiles, and some
apps without status always in the current profile: show an intent
picker instead of directly resolving across profiles.

BUG:25109215

Change-Id: I74a67d231284ce912121ea0818109fbf904183e8
2015-10-22 18:16:39 +01:00
Yoshiki Iguchi
6649ee972b Fix crash on calling removeSelection with showing selection handlers
am: 9582e15196

* commit '9582e151964be60457d4abd712857fb1e8a4586d':
  Fix crash on calling removeSelection with showing selection handlers
2015-10-22 07:39:17 +00:00
Yoshiki Iguchi
9582e15196 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
2015-10-22 07:28:47 +00:00
Lorenzo Colitti
bdc458048a 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.
2015-10-22 06:18:43 +00:00
Lorenzo Colitti
809dcade99 Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev 2015-10-22 06:15:05 +00:00
Nathan Harold
64e8bdc476 Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
am: 0dccd12800

* commit '0dccd128001ceff9437f736bd70dfd1986e315d5':
  Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
2015-10-22 05:23:34 +00:00
Nathan Harold
0dccd12800 Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
-Fixed doc string

Bug: 23979591

This reverts commit f7b6474de87fd2eee377dc612c757102cdacc003.

Change-Id: I127f1452f4319a154dd4d962d4a63c84f0833702
2015-10-21 20:35:46 -07:00
Nathan Harold
5be7dbc88d 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()"
2015-10-22 02:58:15 +00:00
Nathan Harold
42015c4081 Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev 2015-10-22 02:54:45 +00:00
Nathan Harold
f7b6474de8 Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
This reverts commit 5d1429e0dd1a13f76dbb354f9e4e415f71956299.

Doc string isn't resolving. Temporarily reverting.

Change-Id: I128b13abcf938c96b24225e373ac0885c24e083e
2015-10-22 02:53:57 +00:00
Nathan Harold
dc9f8fab0f 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()
2015-10-22 02:03:32 +00:00
Nathan Harold
f8a4dc4a6f Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev 2015-10-22 01:58:37 +00:00
Adrian Roos
655c12edb0 Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev
am: 33e1d376eb

* commit '33e1d376ebd643cba5b507d0005b87d49e246bb5':
  Track ashmem memory usage in Parcel
2015-10-22 00:49:52 +00:00
Adrian Roos
33e1d376eb Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev 2015-10-22 00:46:03 +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
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
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
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
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
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
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
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