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

220269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
8cab9b5f1d Merge "Reset constant width/height when DrawableContainer density changes" 2015-10-22 15:02:32 +00:00
Alan Viverette
4ae5471c72 Merge "Scale density correctly on VectorDrawable.applyTheme()" 2015-10-22 15:02:01 +00:00
Michael Wright
874ce44a80 Merge "Add new Cut / Copy / Paste keys." 2015-10-22 14:47:33 +00:00
Esteban Talavera
b32f8a2b53 Merge "Only system can set app restrictions" 2015-10-22 10:27:10 +00:00
Yoshiki Iguchi
e0ee5d9657 Fix crash on calling removeSelection with showing selection handlers am: 9582e15196 am: 6649ee972b am: 6a5bb1534c 
am: fb8343549a

* commit 'fb8343549a65bf65dab0fce6830b1b39ce62ddaa':
  Fix crash on calling removeSelection with showing selection handlers
 2015-10-22 07:53:41 +00:00
Yoshiki Iguchi
fb8343549a Fix crash on calling removeSelection with showing selection handlers am: 9582e15196 am: 6649ee972b 
am: 6a5bb1534c

* commit '6a5bb1534c736c21260c5c488ff58e4d81972f92':
  Fix crash on calling removeSelection with showing selection handlers
 2015-10-22 07:49:00 +00: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
67fb3d7358 Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev am: 809dcade99 am: bdc458048a am: bb8f652372 
am: 8ecad265b6

* commit '8ecad265b6db57f78dd142e974057c91f69489ed':
  Reinstate CHANGE_NETWORK_STATE as a normal permission.
 2015-10-22 06:33:09 +00:00
Lorenzo Colitti
8ecad265b6 Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev am: 809dcade99 am: bdc458048a 
am: bb8f652372

* commit 'bb8f652372f261edd2083103d4300a9173993706':
  Reinstate CHANGE_NETWORK_STATE as a normal permission.
 2015-10-22 06:28:24 +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
d470bb7dfc Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo() am: 0dccd12800 am: 64e8bdc476 am: 51692ac260 
am: 6f39642389

* commit '6f39642389d2702125898c401ca9e8881a322fe0':
  Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
 2015-10-22 05:39:02 +00:00
Nathan Harold
6f39642389 Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo() am: 0dccd12800 am: 64e8bdc476 
am: 51692ac260

* commit '51692ac260f8acc405ba94e9e83294bb1ef20015':
  Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
 2015-10-22 05:33:10 +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
869a4e4cac Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev am: 42015c4081 am: 5be7dbc88d am: b129c106bd 
am: ce73642a58

* commit 'ce73642a5804a50468fa9bc928333653948c5549':
  Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
 2015-10-22 03:13:02 +00:00
Nathan Harold
ce73642a58 Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev am: 42015c4081 am: 5be7dbc88d 
am: b129c106bd

* commit 'b129c106bde86b8b290cc25cc39f0fcb9b9b48fb':
  Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
 2015-10-22 03:07:57 +00: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
Daichi Hirono
d391813b70 Merge "Support major format code in MtpDocumentsProvider." 2015-10-22 02:23:39 +00:00
Nathan Harold
d66bb15f1a Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am: f8a4dc4a6f am: dc9f8fab0f am: 1a3c88a5bf 
am: c3a94cb6c2

* commit 'c3a94cb6c2097ae2b30500a32ecf95b5714bd8c2':
  Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
 2015-10-22 02:18:46 +00:00
Nathan Harold
c3a94cb6c2 Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am: f8a4dc4a6f am: dc9f8fab0f 
am: 1a3c88a5bf

* commit '1a3c88a5bf8c80d46958830bb6282463c72a4e6b':
  Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
 2015-10-22 02:13:54 +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
Chong Zhang
fdcc4d4235 Assign different oom score to visible apps based on layer ordering. 
Pass oom score in kernel's full range [-1000,1000] to lmkd directly

bug: 21411311

Change-Id: I0cab2aa46269a716ea613025d3b84fe7d04404bb
 2015-10-21 18:16:19 -07:00
Adrian Roos
387d1b25b5 Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev am: 33e1d376eb am: 655c12edb0 am: fda65d780e 
am: b531762c89

* commit 'b531762c89e45b9ac5c401a2e90f9330bcdf629e':
  Track ashmem memory usage in Parcel
 2015-10-22 01:10:15 +00:00
Adrian Roos
b531762c89 Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev am: 33e1d376eb am: 655c12edb0 
am: fda65d780e

* commit 'fda65d780eea9f696b087deb8d532b87e44877b6':
  Track ashmem memory usage in Parcel
 2015-10-22 01:02:27 +00:00
Dianne Hackborn
1b060e83c7 Merge "Hopefully fix issue #25153459: Sandboxed_process1 thrashing" into mnc-dr-dev am: 676534e008 am: 75c2993c91 am: ca8e4ce5fc 
am: 06496d0479

* commit '06496d04791f46a834a6d101068a1a999762d6a2':
  Hopefully fix issue #25153459: Sandboxed_process1 thrashing
 2015-10-22 00:59:09 +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
Dianne Hackborn
06496d0479 Merge "Hopefully fix issue #25153459: Sandboxed_process1 thrashing" into mnc-dr-dev am: 676534e008 am: 75c2993c91 
am: ca8e4ce5fc

* commit 'ca8e4ce5fc6ff65ef267ca1995876968afe24d8d':
  Hopefully fix issue #25153459: Sandboxed_process1 thrashing
 2015-10-22 00:53:08 +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
Adrian Roos
bc14a194e0 Merge "Track ashmem memory usage in Parcel" 2015-10-22 00:31:17 +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
Adrian Roos
4701a496a5 Track ashmem memory usage in Parcel 
Bug: 25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
 2015-10-21 16:52:15 -07:00
Daniel Sandler
c0a69aa91a Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev am: cb10c09f0a am: b4aa8b0c5b am: f7284546d9 
am: f5450e1b33

* commit 'f5450e1b331bb33cf2c831abba3633fb52038cb8':
  Delay hiding the cast icon for 3 seconds.
 2015-10-21 23:36:07 +00: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
f5450e1b33 Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev am: cb10c09f0a am: b4aa8b0c5b 
am: f7284546d9

* commit 'f7284546d930583d1f7d6ca50d80bd74be3eeae4':
  Delay hiding the cast icon for 3 seconds.
 2015-10-21 23:30:29 +00: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