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

205816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Torokhov
5c6a3872cb SystemUI: fix automatic pairing of BT keyboards am: 79f00cf06f 
am: d3eee7c410

* commit 'd3eee7c410dbc6f8eb5133a347fb0a0ce7221893':
  SystemUI: fix automatic pairing of BT keyboards
 2015-10-22 18:18:46 +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
5f8ac21cac Merge "Give watch Home app location permissions by default" into cw-e-dev 
am: 0a3270e00a

* commit '0a3270e00ab6bbba5669288f958cc88c8484a587':
  Give watch Home app location permissions by default
 2015-10-22 17:30:05 +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
Yoshiki Iguchi
6a5bb1534c Fix crash on calling removeSelection with showing selection handlers am: 9582e15196 
am: 6649ee972b

* commit '6649ee972b2bfbeca2d664cfd6629810ebbc7ac8':
  Fix crash on calling removeSelection with showing selection handlers
 2015-10-22 07:44:15 +00: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
bb8f652372 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.
 2015-10-22 06:23:23 +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
51692ac260 Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo() am: 0dccd12800 
am: 64e8bdc476

* commit '64e8bdc4760aebf7f8c80ce3384120ed9b01a3ec':
  Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
 2015-10-22 05:28:26 +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
b129c106bd 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()"
 2015-10-22 03:03:18 +00: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
1a3c88a5bf 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()
 2015-10-22 02:08:56 +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
fda65d780e Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev am: 33e1d376eb 
am: 655c12edb0

* commit '655c12edb0312933249659ab6b23191adcba4fa3':
  Track ashmem memory usage in Parcel
 2015-10-22 00:56:26 +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
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