201979 Commits

Author SHA1 Message Date
Bryce Lee
434a1fd687 Merge "Add config flag for reloading supported profiles in bluetooth on enable." into cw-e-dev 2015-10-23 20:52:44 +00:00
xin He
3b47afe765 Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev 2015-10-23 20:45:24 +00:00
xinhe
2452e54de6 [DO NOT MERGE] EAP-TLS PMKID mismatch error
b/24253154

Change-Id: I45c770dc4769e74b668385dbc3a618d31a40dc7e
2015-10-23 12:56:25 -07:00
Bryce Lee
c17bbe0be2 Add config flag for reloading supported profiles in bluetooth on enable.
Bug: 24977590
Change-Id: I9aa0db5f5488f1ad400f3c0be7d8055ed36725dc
2015-10-23 12:32:07 -07:00
Ching Tzung Lin
e94b3ba099 Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev 2015-10-23 18:05:52 +00:00
Adrian Roos
a53bbb652b Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev
am: 93a6b4c129

* commit '93a6b4c12904bd1804a540d006c183851b0aea33':
  Revert "Revert "Track ashmem memory usage in Parcel""
2015-10-23 17:29:13 +00:00
Adrian Roos
93a6b4c129 Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev 2015-10-23 17:21:23 +00:00
Dianne Hackborn
9161871f83 Merge "DO NOT MERGE Fix issue #24118803: The screen doesn\'t turn off..." into mnc-dr-dev
am: b32e020d23

* commit 'b32e020d237cfd94cdfe8c589900a899dc14413a':
  DO NOT MERGE Fix issue #24118803: The screen doesn't turn off...
2015-10-23 17:09:45 +00:00
Dianne Hackborn
b32e020d23 Merge "DO NOT MERGE Fix issue #24118803: The screen doesn't turn off..." into mnc-dr-dev 2015-10-23 17:04:55 +00:00
Sungmin Choi
af745653d0 Remove tether_apndata for Sasktel
am: a665ea7207

* commit 'a665ea72075dbaa5a86f866ee6c8df5a80f1ced3':
  Remove tether_apndata for Sasktel
2015-10-23 03:26:18 +00:00
Dan Sandler
1044e162c3 Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

Bug: 19121797
(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)

Change-Id: I14d9fb54521dc6d60822e7c683e4e92fd62cdc6a
2015-10-23 01:38:51 +00:00
Dan Sandler
51c2619c77 Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)

Bug: 19121797
Change-Id: I7a5c12b371b735c756ca5a3e8716c385fb3fbfe9
2015-10-23 01:38:36 +00:00
Dan Sandler
446dcc9ed7 Delay hiding the cast icon for 3 seconds. DO NOT MERGE
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
(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)
2015-10-23 01:37:52 +00:00
Adrian Roos
0450565d9a Revert "Revert "Track ashmem memory usage in Parcel""
This reverts commit e2adb2cf0f2c90c77fab3f09285a92e05e70b567.

Bug: 25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
2015-10-22 17:49:38 -07:00
Dianne Hackborn
7730cd2740 DO NOT MERGE Fix issue #24118803: The screen doesn't turn off...
...after more than 60 minutes left

The sensing timeout alarm was being cancelled immediately after it
was scheduled it.  Now only cancel it when we are done sensing or
have reset activity.

Change-Id: Id0440cda7dd1b81bf871f16dfb015df6284cf6af
2015-10-22 17:40:23 -07:00
Sungmin Choi
a665ea7207 Remove tether_apndata for Sasktel
Device has second APN (inet.stm.sk.ca) is being used for hot spot/tethered data.
SaskTel has moved to a single APN on devices (pda.stm.sk.ca).

BUG=25064017
Change-Id: I5ba1f9e7c3b54cf8e8681a289693aba0ac584296
2015-10-22 16:59:44 -07:00
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
Ching Tzung Lin
9c57af4c5a Factor chin size into dimension checking to determine if
CircularDisplayMask can be turned on.

Bug:24797866
Change-Id: I1b8061a8d00dca1877c1360f6fab228a1d72a70a
2015-10-22 15:14:48 -07: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