Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
202,973 Commits 3 Branches 0 Tags
ef56bfb27ae259116fe41fa4b6157828fc67f344
Commit Graph

54202 Commits

Author SHA1 Message Date
Bryce Lee
3e96e06f12 Merge "Make sure that changes to UI in SwipeDismissLayout are on UI thread." into cw-e-dev 2015-08-07 22:37:11 +00:00
Billy Lau
9751afcfbc am 26ab6ed3: am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev 
* commit '26ab6ed3efd9bc55e342caabade46d00f8304240':
  Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
 2015-08-07 22:34:20 +00:00
Billy Lau
26ab6ed3ef am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev 
* commit '70f998e57df2b3ed79331669a93a0ba314f25e7d':
  Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
 2015-08-07 22:22:24 +00:00
Billy Lau
70f998e57d Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev 2015-08-07 22:16:03 +00:00
Bryce Lee
8a148a3b1d Make sure that changes to UI in SwipeDismissLayout are on UI thread. 
Bug: 23036658
Change-Id: I2f51f7275c24f32c5f291f58b0dd331e608d8beb
 2015-08-07 15:15:56 -07:00
Dianne Hackborn
efa4dee126 am 977d421a: am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev 
* commit '977d421af9466ed6cd83630f6ba91c873f501e5b':
  Fix issue #22989030: Separate battery whitelists
 2015-08-07 22:13:02 +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
f0e5501e09 Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev 2015-08-07 21:58:38 +00:00
Matthew Williams
253f2c334e am 2327dd3f: am 9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev 
* commit '2327dd3f808c871f9e89772f06152052f6c74957':
  Correctly skip files that are excluded from restore
 2015-08-07 21:37:33 +00:00
Matthew Williams
2327dd3f80 am 9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev 
* commit '9d92955894118a51e310fdfeeb09f5b1d187c37f':
  Correctly skip files that are excluded from restore
 2015-08-07 21:30:50 +00:00
Matthew Williams
9d92955894 Merge "Correctly skip files that are excluded from restore" into mnc-dev 2015-08-07 21:25:31 +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
Shirish Kalele
74f93f9a8c am d7408469: am 027e3b7f: Merge "Fix check for caller being the active network scorer" into mnc-dev 
* commit 'd7408469f78bf7cb3a3d301f08fd070e20a91963':
  Fix check for caller being the active network scorer
 2015-08-07 20:37:08 +00:00
Shirish Kalele
d7408469f7 am 027e3b7f: Merge "Fix check for caller being the active network scorer" into mnc-dev 
* commit '027e3b7f51cd172dae89f69cc358363b0cf20f5f':
  Fix check for caller being the active network scorer
 2015-08-07 20:30:59 +00:00
Shirish Kalele
027e3b7f51 Merge "Fix check for caller being the active network scorer" into mnc-dev 2015-08-07 20:25:06 +00:00
Dianne Hackborn
1dd818dbb2 am eed29a71: am 53d6cddb: Merge "Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today" into mnc-dev 
* commit 'eed29a71098284dbcd5bbbd2041c692eb3eb6a1d':
  Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today
 2015-08-07 18:35:50 +00:00
Billy Lau
a7238a397d Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS 
Merge the CHANGE_NETWORK_STATE permission with WRITE_SETTINGS.

AndroidManifest.xml:
Raised the protection level of CHANGE_NETWORK_STATE permission from
normal to signature|appops and pre23|preinstall for compatibility

provider/Settings:
Wrote new helper methods to check if app is allowed to change network
state.

ConnectivityManager.java & ConnectivityService.java:
Replace enforcement checks for CHANGE_NETWORK_STATE with
checkAndNoteChangeNetworkStateOperations instead.

Change-Id: If8c2dd3c76a5324ca43f1d90fa17973216c2bcc5
 2015-08-07 19:29:51 +01:00
Michael Wright
97e7762782 Merge commit '9dd2663d' into mm 
Change-Id: Idf37dbc3bba970817e6620fe0129e54e86f553d5
 2015-08-07 19:13:34 +01:00
Dianne Hackborn
eed29a7109 am 53d6cddb: Merge "Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today" into mnc-dev 
* commit '53d6cddb4137c7b5648fc069adcc0cf6c501a6c4':
  Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today
 2015-08-07 17:53:24 +00:00
Michael Wright
9dd2663db4 am d7255cfb: Merge "DO NOT MERGE. Add new media navigation keys." into mnc-dev 
* commit 'd7255cfb1cf8dc7249632d93d68daac8cc2c7b9c':
  DO NOT MERGE. Add new media navigation keys.
 2015-08-07 17:53:17 +00:00
Dianne Hackborn
53d6cddb41 Merge "Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today" into mnc-dev 2015-08-07 17:18:11 +00:00
Michael Wright
d7255cfb1c Merge "DO NOT MERGE. Add new media navigation keys." into mnc-dev 2015-08-07 16:52:27 +00:00
Svetoslav Ganov
1f51460887 am 5a624aad: am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev 
* commit '5a624aad5faa0a71ce6495671caac1ccd90544ba':
  Immediately kill a shared user process on a permission revocation.
 2015-08-07 15:40:35 +00:00
Svetoslav Ganov
5a624aad5f am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev 
* commit '38d30dc547825bdde2756f588692063a28749e8d':
  Immediately kill a shared user process on a permission revocation.
 2015-08-07 15:33:48 +00:00
Svetoslav Ganov
38d30dc547 Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev 2015-08-07 15:27:49 +00:00
Michael Wright
600b984760 DO NOT MERGE. Add new media navigation keys. 
Bug: 22059484
Change-Id: Ifd8fd18178fed45ead2980b957dd1d177e40f165
 2015-08-07 14:46:05 +01:00
Dianne Hackborn
6ff55fcb85 Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today 
Try to deal well with badly behaving old apps.

Change-Id: Ibc41e5867869463fbf91f3e411c69677909fedad
 2015-08-06 22:54:46 -07:00
Svetoslav
aa41add33b Immediately kill a shared user process on a permission revocation. 
1. When a permission is revoked we kill the app immediately but do
   not do an immediate kill for shared uid processes. This fixes it.

2. Remove system APIs that are used only by the package installer.

bug:22984670

Change-Id: I3d4ae52ea8679f894aa7c5972941263903479183
 2015-08-06 18:47:41 -07:00
Andres Morales
7ab11e45bd am 5fd47543: am 85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev 
* commit '5fd4754310a9b19c7b880197e5bd237e2959c040':
  [UserManager] expose method to retrieve credential owner
 2015-08-06 22:36:08 +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
Shirish Kalele
4cab12d91d Fix check for caller being the active network scorer 
Compare caller and scorer uids to decide if caller is the
active scorer instead of calling AppOps.checkPackage().

Bug: 23000690
Change-Id: I64285f965716f3aceb24f193d86ab9d6be7202c5
 2015-08-06 12:53:59 -07:00
Chris Wren
8a38babb50 am 062130d9: am 93f3fc87: Merge "add metrics to assistant" into mnc-dev 
* commit '062130d95d239d42a9ac3bd6211c70ca61cd3b89':
  add metrics to assistant
 2015-08-06 19:28:33 +00:00
Chris Wren
062130d95d am 93f3fc87: Merge "add metrics to assistant" into mnc-dev 
* commit '93f3fc876639cd23ff176cba2e1f8f08df6f3fb5':
  add metrics to assistant
 2015-08-06 19:25:08 +00:00
Chris Wren
93f3fc8766 Merge "add metrics to assistant" into mnc-dev 2015-08-06 19:18:17 +00:00
Chris Wren
a35c96eb90 add metrics to assistant 
long press
  screenshot enabled
  context enabled

Bug: 22949579
Change-Id: Iac178207fa7149cda03c9a817a0d1450e46e1c59
 2015-08-06 15:11:42 -04:00
Alan Viverette
8a782c9de4 am db576e1d: am c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev 
* commit 'db576e1d0cead619164afacefdb6215194285a32':
  Update anchor background on the correct view in PopupWindow
 2015-08-06 18:02:47 +00:00
Alan Viverette
db576e1d0c am c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev 
* commit 'c7f8133fa1ff78fea5a54974b5987791cb012f84':
  Update anchor background on the correct view in PopupWindow
 2015-08-06 17:55:38 +00:00
Alan Viverette
c7f8133fa1 Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev 2015-08-06 17:48:22 +00:00
Matthew Williams
b9ebed56e4 Correctly skip files that are excluded from restore 
BUG: 22957980
If a file was present in the backup but excluded on restore,
it can result in the restored data being corrupted.
Ensure that FullBackup.restoreFile is called with a
null destination, which will result in the file not
being written to disk, but still properly pulled
from the socket.

Change-Id: Iac882a961b76e687654535aec352678486a08c39
 2015-08-06 10:28:08 -07:00
Dianne Hackborn
41dfffb357 am db6a6a21: am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev 
* commit 'db6a6a215e9f55b9413e18ca9c67aa3ef31bbefb':
  Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
 2015-08-06 17:00:47 +00:00
Dianne Hackborn
db6a6a215e am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev 
* commit '6b0f1e78b841a32b45f513d283202e3af90c6a73':
  Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
 2015-08-06 16:53:56 +00:00
Dianne Hackborn
6b0f1e78b8 Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev 2015-08-06 16:48:34 +00:00
Chet Haase
42c70645d2 am aed2e8ba: am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev 
* commit 'aed2e8baedd9cf3fb4472d4215dc9b15da390a94':
  Avoid changing internal state of shared drawable
 2015-08-06 16:38:02 +00:00
Alan Viverette
697804e8de Update anchor background on the correct view in PopupWindow 
We were always setting the background of the decor view when the
"above anchor" state changed, rather than the background view.

Bug: 22970244
Change-Id: I3cd7202767ee47cb415736bb3c07369801abccd8
 2015-08-06 12:36:47 -04:00
Chet Haase
aed2e8baed am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev 
* commit 'da493aa6eab24de98b63cc63c457f5b899da3ad2':
  Avoid changing internal state of shared drawable
 2015-08-06 16:29:33 +00:00
Chet Haase
da493aa6ea Merge "Avoid changing internal state of shared drawable" into mnc-dev 2015-08-06 16:23:20 +00:00
Alan Treadway
54f1ffcdd6 am 2d1cf627: am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev 
* commit '2d1cf6278587224125da298aba42044aff1d5d8c':
  Update documentation of DevicePolicyManager intents.
 2015-08-06 15:59:43 +00:00
Alan Treadway
2d1cf62785 am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev 
* commit '190a88d2ce6a08d0eb98d774b81e5ca6b82b45f8':
  Update documentation of DevicePolicyManager intents.
 2015-08-06 15:51:04 +00:00
Alan Treadway
190a88d2ce Merge "Update documentation of DevicePolicyManager intents." into mnc-dev 2015-08-06 15:47:34 +00:00