Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
211,447 Commits 3 Branches 0 Tags
eff1b7175d2c32ff91cb766ea454ffee787bed9f
Commit Graph

2699 Commits

Author SHA1 Message Date
Dianne Hackborn
d38e7c9387 am 1dd2f5a3: am 40bc2066: am a54d4583: am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit '1dd2f5a3ebd4768ebc8bf4c08c7f62c8c1300c7f':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 02:10:15 +00:00
Dianne Hackborn
1dd2f5a3eb am 40bc2066: am a54d4583: am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit '40bc20660d3dc65f66e4409893f1ba6bf729d97f':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 01:18:13 +00:00
Dianne Hackborn
9512a85745 am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit 'ff9912d594bc5cdc10a4a224b9a2296bac50851b':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 00:54:35 +00:00
Dianne Hackborn
c3f7449517 Fix issue #23116383: Include security patch level in Settings 
Change-Id: I4934c7d26bf69b5c599962cd74ac1e4ea4ad4b51
 2015-08-12 16:10:58 -07:00
Dianne Hackborn
908109c1f9 am 0385e3e9: am 8e63bbfd: am efa4dee1: am 977d421a: am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev 
* commit '0385e3e908fb9988bb2d2d0d15e32cb6a819b34e':
  Fix issue #22989030: Separate battery whitelists
 2015-08-08 02:49:41 +00:00
Dianne Hackborn
0385e3e908 am 8e63bbfd: am efa4dee1: am 977d421a: am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev 
* commit '8e63bbfd00ee27fcdbb04cfc0cf96ccdb2c50cc5':
  Fix issue #22989030: Separate battery whitelists
 2015-08-07 22:30:17 +00:00
Dianne Hackborn
977d421af9 am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev 
* commit 'f0e5501e093c688cd293308e0aafc2b55326c255':
  Fix issue #22989030: Separate battery whitelists
 2015-08-07 22:06:00 +00:00
Dianne Hackborn
4a503b1ece Fix issue #22989030: Separate battery whitelists 
We now have a new whitelist you can put apps in, which
opts them out of the old battery saver mode and new app idle,
but doesn't keep them from going in to doze.  This is for a few
special cases that we had previously whitelisted for battery saver,
and inherited to the new modes...  ultimately we should figure out
how to get these apps out of the whitelist completely, but this
will help for now.

Apps in this new whitelist are not shown in the UI, because they
are still significantly restricted by not being able to operate
normally in doze.  This also means they are still visible in the
list of all apps for the user to be able to put them on/off the
complete whitelist if that is what they really want.

In the course of doing this, I needed to clean up code in the
network policy manager to better separate management of the
two firewall rules that now have different whitelists applied
to them.  This also hopefully just generally simplifies and cleans
up that code.  Hopefully!

Change-Id: I92e15f2f85899571dd8b049b5e3eb1354f55f353
 2015-08-07 14:23:32 -07:00
Andres Morales
768352fdae am e0a7cfa0: am 981c4561: am 7ab11e45: am 5fd47543: am 85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev 
* commit 'e0a7cfa026da56f1197c1feea79f76153c5eddd5':
  [UserManager] expose method to retrieve credential owner
 2015-08-06 22:54:53 +00:00
Andres Morales
e0a7cfa026 am 981c4561: am 7ab11e45: am 5fd47543: am 85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev 
* commit '981c456170cbe90a850ee21f3b3efd52de659ec4':
  [UserManager] expose method to retrieve credential owner
 2015-08-06 22:49:39 +00:00
Andres Morales
5fd4754310 am 85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev 
* commit '85c73c40d1fd76e8a7bbd90ab80458082764c1c3':
  [UserManager] expose method to retrieve credential owner
 2015-08-06 22:30:59 +00:00
Andres Morales
85c73c40d1 Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev 2015-08-06 22:22:17 +00:00
Michael Wright
fd650fec6b am d239bb5e: am a7b3694c: am b9bdde13: am 1663c75f: am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev 
* commit 'd239bb5ebd80a3a4336759c35388772e9bf1c1dc':
  Make the NullVibrator really null.
 2015-08-06 14:25:53 +00:00
Michael Wright
d239bb5ebd am a7b3694c: am b9bdde13: am 1663c75f: am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev 
* commit 'a7b3694c56dfc85a4edbb868815ee3dd0998a5b9':
  Make the NullVibrator really null.
 2015-08-06 14:18:50 +00:00
Michael Wright
1663c75fa7 am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev 
* commit 'd5a6df6d228036258d616245502c1a4f85ba4b2e':
  Make the NullVibrator really null.
 2015-08-06 13:58:05 +00:00
Michael Wright
d5a6df6d22 Merge "Make the NullVibrator really null." into mnc-dev 2015-08-06 13:52:34 +00:00
Andres Morales
c5548c02fe [UserManager] expose method to retrieve credential owner 
Certain operations (like ConfirmCredential) can be invoked
in the context of a profile, in which case the calling code
needs to know under what profile the credential is registered.

Expose a centralized location for this information for Settings
and GateKeeper to consume.

Bug: 22257554
Change-Id: Iffe4f6a254f52d1269b9287edabcf6efa515d9d2
 2015-08-05 10:50:05 -07:00
Xiaohui Chen
2b45f8a6ce Clean up USER_OWNER references in settingslib. 
Bug: 19913735
Change-Id: I0ccaed63c8fbc3bcbbd8d5cf8047e33c6e2edb5c
 2015-08-05 16:31:19 +00:00
Paul Jensen
9180e2ea59 am abd27102: am 41779e46: am 95297732: am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev 
* commit 'abd27102f4e232be448bc6012e0bd833637ab3fa':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-08-05 11:44:46 +00:00
Paul Jensen
abd27102f4 am 41779e46: am 95297732: am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev 
* commit '41779e467a478e11de2df10ad97542e6f2d57ca7':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-08-05 11:38:26 +00:00
Paul Jensen
86e7d135ac resolved conflicts for merge of dbc4edcc to mnc-dr-dev 
Change-Id: I3a8624b2b375e0d174983d7690082e0e6932c4de
 2015-08-05 07:07:24 -04:00
Paul Jensen
dbc4edccfc Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev 2015-08-05 10:03:47 +00:00
Paul Jensen
487ffe7d3d Fix NOT_RESTRICTED network capability and enforce it. 
With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
   special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
   permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
   CONNECTIVITY_INTERNAL permission

Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
 2015-08-04 07:24:24 -04:00
Todd Kennedy
5555259667 am e2345774: am 772c6c0d: am 40f0efe0: Merge "Add a trace constant for PackageManager" 
* commit 'e23457741da693417adc03c3cde290e0e8e4b471':
  Add a trace constant for PackageManager
 2015-08-03 19:40:48 +00:00
Todd Kennedy
e23457741d am 772c6c0d: am 40f0efe0: Merge "Add a trace constant for PackageManager" 
* commit '772c6c0d2d62af7295030ded14b3f428ab325ef4':
  Add a trace constant for PackageManager
 2015-08-03 19:33:07 +00:00
Yusuke Sato
22350a8c2c am 82e78074: am b98e2353: am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones" 
* commit '82e780743046e620b724c28023b580e0e624bb15':
  Distinguish user-requested shutdown from power-related ones
 2015-08-03 18:14:37 +00:00
Yusuke Sato
82e7807430 am b98e2353: am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones" 
* commit 'b98e235364c2b221521f622c546733b2862e4677':
  Distinguish user-requested shutdown from power-related ones
 2015-08-03 17:56:37 +00:00
Todd Kennedy
114beb21a0 Add a trace constant for PackageManager 
Change-Id: Ida391be765c63d7b6da3d9fd9d1d975e51b4f3e7
 2015-08-03 09:56:07 -07:00
Dianne Hackborn
f6f1a7ec99 am 628b4125: am bc2a8843: am b97c5ddd: am 9b36f526: am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev 
* commit '628b4125843b93dc7f3ed0c9bbea76ff470d2eed':
  Change MNC codename to just M.
 2015-08-01 17:53:09 +00:00
Dianne Hackborn
628b412584 am bc2a8843: am b97c5ddd: am 9b36f526: am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev 
* commit 'bc2a88431e3dc51e2245cc28e327f11d0c78bd56':
  Change MNC codename to just M.
 2015-08-01 17:04:28 +00:00
Dianne Hackborn
9b36f526dd am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev 
* commit 'c1836bb0f1bf3e5ef0911719525da0bab3e53507':
  Change MNC codename to just M.
 2015-07-31 19:42:11 +00:00
Dianne Hackborn
c1836bb0f1 Merge "Change MNC codename to just M." into mnc-dev 2015-07-31 17:11:58 +00:00
Yusuke Sato
705ffd1efe Distinguish user-requested shutdown from power-related ones 
With this patch, when the user requested shutdown,
PowerManagerService sets sys.powerctl is set to
"shutdown,userrequested", and init runs fsck on shutdown.

When shutdown is triggered due to a low power state etc.,
the service sets the property to "shutdown,", and init
immediately shuts down the system without running the
command.

This is a follow-up CL for http://r.android.com/158525.

Bug: 21853106
Change-Id: Iae72990130fe9aa479c802f77301438190dbbfb3
 2015-07-30 23:47:13 -07:00
Adam Lesinski
81b80d3ebf am 59bd2ae1: am c8c3539d: am eec946aa: am ee6046ad: am 00f7cb92: Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev 
* commit '59bd2ae1af5d1236dae14f0539d48acfa08d5e80':
  BatteryStats: include mobile radio active count and unknown time in checkin
 2015-07-31 00:31:45 +00:00
Adam Lesinski
59bd2ae1af am c8c3539d: am eec946aa: am ee6046ad: am 00f7cb92: Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev 
* commit 'c8c3539de720449d60b754aabc19bf2693eaa09b':
  BatteryStats: include mobile radio active count and unknown time in checkin
 2015-07-31 00:20:23 +00:00
Adam Lesinski
ee6046add1 am 00f7cb92: Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev 
* commit '00f7cb924e6964c5403c55ae5e7348aad1c8ec7b':
  BatteryStats: include mobile radio active count and unknown time in checkin
 2015-07-30 23:58:30 +00:00
Adam Lesinski
00f7cb924e Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev 2015-07-30 23:50:27 +00:00
Adam Lesinski
782327bde7 BatteryStats: include mobile radio active count and unknown time in checkin 
These are important values to help diagnose modem related wakeup issues.

Bug:22803686
Bug:22857991
Change-Id: Ie0164ebd194567bc10d1165d671a583674a39829
 2015-07-30 23:50:10 +00:00
Michael Wright
5e829abd71 Make the NullVibrator really null. 
Currently any calls into vibrate just end up in an infinite loop
until the program's stack overflows.

Bug: 22835503
Change-Id: I640c3990b597ac69d83b3656e00daad088002982
 2015-07-30 15:49:50 +01:00
Dianne Hackborn
24982dc19e am 9820374a: am f228f455: am 17043db8: am 69e7fa8a: am 8d3a67a8: Merge "More maybe fix issue #22765972: Binder transactions running out..." into mnc-dev 
* commit '9820374a5facbcde9f49c8cdf10cfd8ab83f0599':
  More maybe fix issue #22765972: Binder transactions running out...
 2015-07-30 02:40:07 +00:00
Dianne Hackborn
9820374a5f am f228f455: am 17043db8: am 69e7fa8a: am 8d3a67a8: Merge "More maybe fix issue #22765972: Binder transactions running out..." into mnc-dev 
* commit 'f228f455ea7fbec00f731773e5a51f55e9eb792f':
  More maybe fix issue #22765972: Binder transactions running out...
 2015-07-30 02:26:51 +00:00
Dianne Hackborn
69e7fa8a52 am 8d3a67a8: Merge "More maybe fix issue #22765972: Binder transactions running out..." into mnc-dev 
* commit '8d3a67a8d475b43cbac50a2a186a19f4a29c7892':
  More maybe fix issue #22765972: Binder transactions running out...
 2015-07-30 01:44:38 +00:00
Dianne Hackborn
6b42bc0e21 More maybe fix issue #22765972: Binder transactions running out... 
...of address space causing package manager to fail

Make sure to flush binder commands when done with an async task.

Change-Id: I9f171add7051587ab854226b97a12c7e1844ad5d
 2015-07-29 17:58:33 -07:00
Dianne Hackborn
0e3de6caca Change MNC codename to just M. 
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
 2015-07-29 15:20:21 -07:00
Dianne Hackborn
fc15b56bd2 am b003d9a8: am c4ed81af: am cb98228d: am deb28b77: am eda1cc50: Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev 
* commit 'b003d9a8032a672dbcb76a9750522953d1c0db5d':
  Work on issue #22765972: Binder transactions running out of address...
 2015-07-29 18:42:48 +00:00
Dianne Hackborn
b003d9a803 am c4ed81af: am cb98228d: am deb28b77: am eda1cc50: Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev 
* commit 'c4ed81af8a12fac07c797870207e07cf7dc982c7':
  Work on issue #22765972: Binder transactions running out of address...
 2015-07-29 18:20:56 +00:00
Dianne Hackborn
deb28b770a am eda1cc50: Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev 
* commit 'eda1cc50cead674287616e6a852f8f281b70b9f5':
  Work on issue #22765972: Binder transactions running out of address...
 2015-07-29 17:25:15 +00:00
Dianne Hackborn
eda1cc50ce Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev 2015-07-29 17:05:58 +00:00
Jeff Sharkey
4b76c496c6 am 7412dfe9: am 3f6c3849: am 170235a3: am acfaa947: am b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev 
* commit '7412dfe98daaf76377fc5d08e8b9bf994455b2a3':
  Give secondary users read-only physical cards.
 2015-07-29 03:41:19 +00:00
Jeff Sharkey
7412dfe98d am 3f6c3849: am 170235a3: am acfaa947: am b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev 
* commit '3f6c3849e96692da51c0e8cb22cce92b6ed9b60b':
  Give secondary users read-only physical cards.
 2015-07-29 03:20:52 +00:00