Commit Graph

58815 Commits

Author SHA1 Message Date
Svetoslav Ganov
d0e3d18b7f Merge "Properly map runtime permissions to app ops" into nyc-dev
am: ba83e90e18

* commit 'ba83e90e1825f3e40a16370babc83b8ac0645cf9':
  Properly map runtime permissions to app ops

Change-Id: Ied52aa9c152429092f3c9f3e93b79b5e58c27cac
2016-05-06 23:17:53 +00:00
Svetoslav Ganov
ba83e90e18 Merge "Properly map runtime permissions to app ops" into nyc-dev 2016-05-06 23:08:31 +00:00
Felipe Leme
443c032e52 Merge "Refactored NetworkPolicyManagerService mUidRules." into nyc-dev
am: de66540fd3

* commit 'de66540fd3f73937c3cfbe1d50e575aa69acc474':
  Refactored NetworkPolicyManagerService mUidRules.

Change-Id: I25d2520eafcf8c45b80b94908a3b5bfa04315f76
2016-05-06 21:53:39 +00:00
Christopher Tate
2591ee2b0b Merge "Move the \'pretend idle jobs can run now\' broadcast into AMS" into nyc-dev
am: 0588954071

* commit '058895407140de0e513b82150c3acb6131e971a2':
  Move the 'pretend idle jobs can run now' broadcast into AMS

Change-Id: Id8bd50f0a5f6d46cf60dea690803081515cb21c3
2016-05-06 21:42:47 +00:00
TreeHugger Robot
de66540fd3 Merge "Refactored NetworkPolicyManagerService mUidRules." into nyc-dev 2016-05-06 21:41:41 +00:00
Chris Tate
0588954071 Merge "Move the 'pretend idle jobs can run now' broadcast into AMS" into nyc-dev 2016-05-06 21:34:52 +00:00
Pavlin Radoslavov
3600d1f06f Merge "Fix divergent equals and hashCode behavior" into nyc-dev
am: 2ff5780d90

* commit '2ff5780d903bb052fd9349b742d4d754f049202c':
  Fix divergent equals and hashCode behavior

Change-Id: Iac35b033432a9441c3a72b8f7430f15238e1e8fb
2016-05-06 21:08:17 +00:00
Pavlin Radoslavov
2f463d4c8b Fix divergent equals and hashCode behavior
Calling Objects.hash with a byte[] will call the identity hashCode on
the byte[] and this doesn't agree with the use of Objects.deepEquals
in equals.
Bug caught by error prone.

Also, replaced usage of Objects.deepEquals(mServiceDataUuid, ...) with
Objects.equals(mServiceDataUuid, ...), because mServiceDataUuid
is an Object of type ParcelUuid.

Bug: 28585195
Change-Id: Id92734874339985fedafe1a28286a6a4dcd88d3b
2016-05-06 12:45:43 -07:00
Wale Ogunwale
d9125edb98 Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev
am: 5d6a218d9e

* commit '5d6a218d9e0d21367f6365d4de51532ca7e14dc9':
  Dismiss docked stack if an activity is shown on top of the lock screen

Change-Id: I4bf1ef48aef928e12d7dbb9faa6c4e0d489acadb
2016-05-06 18:42:09 +00:00
TreeHugger Robot
5d6a218d9e Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev 2016-05-06 18:30:23 +00:00
Phil Weaver
709fb89a9d Merge "Make AccessibilityService#disableSelf atomic." into nyc-dev
am: b42afe9be0

* commit 'b42afe9be02b23c50c0479e93df2a853be7c369a':
  Make AccessibilityService#disableSelf atomic.

Change-Id: I0c401dfbe7080535595e1c4b6b2365f17fab6dd9
2016-05-06 18:26:22 +00:00
Christopher Tate
27d92e4e39 Move the 'pretend idle jobs can run now' broadcast into AMS
It's a protected broadcast, so sending it directly from 'am' is
no longer an option.  This is needed for CTS as well as being
generally useful during app development.

Bug 28406044

Change-Id: I101915a8c6f19454330a8db2079a75023c112582
2016-05-06 11:25:11 -07:00
Chris Thornton
b6dba40c9e Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev
am: 0f6a7abb83

* commit '0f6a7abb83687e8f800e7754cf585edca725d83e':
  Fix NPE in KeyphraseEnrollmentInfo.toString()

Change-Id: Id6e61a0ef2d51317a749526d132a6c9fb96899fa
2016-05-06 18:10:23 +00:00
Phil Weaver
b42afe9be0 Merge "Make AccessibilityService#disableSelf atomic." into nyc-dev 2016-05-06 18:08:29 +00:00
Chris Thornton
0f6a7abb83 Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev 2016-05-06 18:04:20 +00:00
Felipe Leme
46c4fc357c Refactored NetworkPolicyManagerService mUidRules.
NetworkPolicyManagerService (NMPS) keeps an internal list of uid
rules (mUidRules) for network restrictions, and when these rules
changes it needs to notify external listeners (such as
ConnectivityService / CS).

Prior to Android N, both Data Saver mode (the feature previously known
as "Restrict Baground Data") and Battery Save mode used the same set of
firewall rules to implement their restrictions: when Battery Saver mode
NPMS would mark all networks as metered and set the proper firewall
rules externally.

Recently, these 2 modes were split in 2 distinct firewall rules and
NMPS.updateRuleForRestrictBackgroundLocked() was changed to update
the mUidRules logic based on the Data Saver firewall (since the Battery
Saver firewall changes are handled externally, on
updateRuleForRestrictPowerLocked()). As such, CS was not notified when
the power-related changes were made, which would cause apps to get a
state of CONNECTED / CONNECTED when querying its active connection.

This change refactores the mUidRules to use bitmasks, in preparation for
another change that will fix the issue.

It also fixes a minor bug that was preventing removed packages to be
removed from the whitelist.

BUG: 28521946
Change-Id: I9f0e1509a6192cad403f740c1cd76a6b7dab7d26
2016-05-06 17:58:40 +00:00
Hans Boehm
1a72cf2e4f Merge "Improve grammar in startService() documentation." am: e3a25ad692
am: cc9c83dbd4

* commit 'cc9c83dbd4123cf4677cd351fd0b96d9d04ffbee':
  Improve grammar in startService() documentation.

Change-Id: I7a7296839c0b9ec89002dead994cc346e1969567
2016-05-06 17:41:18 +00:00
Hans Boehm
cc9c83dbd4 Merge "Improve grammar in startService() documentation."
am: e3a25ad692

* commit 'e3a25ad692cf88455222522542fe374a41024ccf':
  Improve grammar in startService() documentation.

Change-Id: Iaa95eb5d01d45b8352f1eeb0a7f1519b1958ddd4
2016-05-06 17:36:11 +00:00
Wale Ogunwale
9973294080 Dismiss docked stack if an activity is shown on top of the lock screen
It is risky/complicated to try to put the activity showing on-top of
the lock screen in the right fullscreen configuration with the current
architecture. So, we just dismiss for now.

Bug: 28195260
Change-Id: I29a0350993ce8fe548d4a465b06d877cde151c78
2016-05-06 10:13:14 -07:00
Phil Weaver
19557de767 Make AccessibilityService#disableSelf atomic.
This API was using a oneway aidl call, which meant that the
service was disabled some time after the method returned. That
confused tests that were turning a service off during tearDown
and then turning it back on again in setUp.

Bug: 28621277

Change-Id: I75984df0613bdbb1bc876e2a15caf59106027337
2016-05-06 08:57:12 -07:00
Ricky Wai
de1e4a1048 Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev
am: 13532bdd2e

* commit '13532bdd2ea63c1b8a5a8d4f95346f3d1e7ecbb5':
  Fix enterprise contacts APIs naming and docs

Change-Id: I22bd5f8f3d71ae19a2fcac139531243f2546033e
2016-05-06 12:19:00 +00:00
Tony Mak
13532bdd2e Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev 2016-05-06 12:06:29 +00:00
Svetoslav Ganov
eaca4c5022 Properly map runtime permissions to app ops
The code assumed mapping from a permission to an app op
is one to one but this is not always the case. For example,
READ_SMS is mapped to OP_READ_SMS and OP_READ_ICC_SMS which
resulted mapping the READ_SMS permission to the OP_READ_ICC_SMS
instead of OP_READ_SMS resulting in a failure to find the op
name given the permission.

This breaks the AppOpsManager.permissionToOp() API for READ_SMS
returning null instead of OPST_READ_SMS. The consequence of this
is that the apps that proxy permission protected operations may
let the operations for READ_SMS go through as they would get a
null app op, i.e. no app op while there is one and it can be
disabled for the caller.

bug:28620132

Change-Id: I92f8ef375ae2122b7266c50653ce73f3d90f4b28
2016-05-05 18:21:09 -07:00
Chris Thornton
d9729d1df8 Fix NPE in KeyphraseEnrollmentInfo.toString()
If there are no enrollment applications on the system, but someone still
makes a KeyphraseEnrollmentInfo and tries to print it, it would generate
a NPE on a map object. Instead of setting the map to null when we don't
find any enrollment applications, we can just set it to an empty map.

Bug:28622866
Change-Id: I023e6fd90effd3143c19817a0d6637a013bebc31
2016-05-05 17:20:44 -07:00
Adam Lesinski
3297250b9c Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev
am: c1ff12eccd

* commit 'c1ff12eccd0e48ff7feab62387e60ae4010a3cc9':
  Fix issue where existing Activity Resources references would not update

Change-Id: I1b411b89dae0aa623d796ab2ab7dabb52a6e28c0
2016-05-05 23:35:31 +00:00
Adam Lesinski
c1ff12eccd Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev 2016-05-05 23:23:43 +00:00
Vladislav Kaznacheev
46d24970ed Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev
am: 7d2a0a0571

* commit '7d2a0a05715841b582cbaefa3fd0e0a542064556':
  Add @TestApi to ActivityOptions.setLaunchStackId

Change-Id: I51b1329b14754fa9f765452769a4e311a69ae6bb
2016-05-05 23:16:04 +00:00
Adam Lesinski
8ce4e12c73 Fix issue where existing Activity Resources references would not update
When relaunching an Activity, the DecorView and ViewRootImpl is re-used,
along with the IBinder activity token. This means that when we create
new resources, we end up just updating the base Activity resources.

However, we would set the configuration to the new requested override
config and then proceed to update existing Resources references, which
would return immediately due to the equality check for configuration
updates.

This change pushes the setting of the new override config to the
updateResourcesForActivity method, which will properly update Resources
references that are held in the re-used DecorView.

Bug:27915587
Change-Id: I113007a40fa464b8a234b073dcf851e16fee0177
2016-05-05 23:08:09 +00:00
Vladislav Kaznacheev
7d2a0a0571 Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev 2016-05-05 23:04:49 +00:00
Christopher Tate
f4f2ef5162 Correct docs about what is ignored in full-data backup
am: c5be8f8a4b

* commit 'c5be8f8a4b9946f26f43201a06e7ec3f9b34857e':
  Correct docs about what is ignored in full-data backup

Change-Id: Id1618de0e4027135a320cd133c244ba33d2960aa
2016-05-05 22:31:53 +00:00
Joe Onorato
67af8a12ae Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev
am: 47384f90b4

* commit '47384f90b4adb6dc4a005a7870e0ec6841042151':
  Add the individual wakeup alarm counts to the batterystats checkin.

Change-Id: I0bfd7f8967e828500fbae93673ec2bbf31d42b1c
2016-05-05 22:22:02 +00:00
Christopher Tate
c5be8f8a4b Correct docs about what is ignored in full-data backup
You can't back up content in e.g. getNoBackupFilesDir() even if your
app explicitly tries to.

Bug 28321431

Change-Id: Ifa2a4bc518de03aba4c8809e60d8bb90fce767f8
2016-05-05 22:20:46 +00:00
Joe Onorato
47384f90b4 Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev 2016-05-05 22:11:57 +00:00
Yohei Yukawa
94c9aadc99 Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev
am: 9f76abc8ab

* commit '9f76abc8ab9db3306c8061e9719dbe2a998031f3':
  Fix stale InputMethodManager#mFullscreenMode.

Change-Id: If27212387cd76bb6cc7f1cd1d844bd3ca07915e8
2016-05-05 22:02:30 +00:00
Yohei Yukawa
9f76abc8ab Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev 2016-05-05 21:55:50 +00:00
Joe Onorato
1476d32b87 Add the individual wakeup alarm counts to the batterystats checkin.
Bug: 28601365
Change-Id: I94ad69eeb575f75d62bd45076184f521bd11052d
2016-05-05 14:53:25 -07:00
Hans Boehm
fb9f6acd6f Improve grammar in startService() documentation.
Change-Id: If72f710caa2e85512636d6f7ddacff2426cfb835
2016-05-05 13:09:28 -07:00
Robert Carr
b9d2502eac Merge "Prepare to replace windows across recreate()." into nyc-dev
am: ea162c3c79

* commit 'ea162c3c7992b01d8d56766a94e56a0cee3fe3b2':
  Prepare to replace windows across recreate().

Change-Id: I3f78aa81d76e0a71f616037c531e7755760b41cf
2016-05-05 19:47:36 +00:00
TreeHugger Robot
ea162c3c79 Merge "Prepare to replace windows across recreate()." into nyc-dev 2016-05-05 19:38:17 +00:00
Alan Viverette
ff71f781a3 Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev
am: 3a3fb73c75

* commit '3a3fb73c753efb2114693b1943246bc6c47f9470':
  Revert "Always assign leftover pixels to last weighted child"

Change-Id: I292d86c36049afe621f559d01a12976c9f6068ca
2016-05-05 18:54:34 +00:00
Alan Viverette
3a3fb73c75 Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev 2016-05-05 18:37:43 +00:00
Alan Viverette
61c41bf617 Revert "Always assign leftover pixels to last weighted child"
This reverts commit cc26636f08.

Bug: 27690033
Change-Id: Ib7084dd8961cd486de4e6b13e36da7be887b1835
2016-05-05 17:54:36 +00:00
Jason Monk
eb435a3a4c Merge "Add action to launch webview implementation settings" into nyc-dev
am: c91f5e2971

* commit 'c91f5e297135f9601c7fa6ebe3f4bdc9ad9af112':
  Add action to launch webview implementation settings

Change-Id: I26fb9e07522ed522ad551e7f39a66b2f9ad93748
2016-05-05 17:07:12 +00:00
Jason Monk
c91f5e2971 Merge "Add action to launch webview implementation settings" into nyc-dev 2016-05-05 16:56:20 +00:00
Vladislav Kaznacheev
acf147e7e3 Add @TestApi to ActivityOptions.setLaunchStackId
Bug: 28506739
Change-Id: I20fe4d080c125b38a84d9832a497340f805e82e7
2016-05-05 09:32:27 -07:00
Rubin Xu
b9d94a454d Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev
am: 1448962a95

* commit '1448962a95f40db93af02057e0804a375f3d62ca':
  Guard retrievePreRebootSecurityLogs with config flag

Change-Id: I30bfa6eb621ced3a9aab4f10ad8bd89fee6ee675
2016-05-05 13:12:45 +00:00
Rubin Xu
0fb6b9e18c Guard retrievePreRebootSecurityLogs with config flag
Bug: 28160645
Change-Id: Ifce884c319019758dfaaa39bc239e9f30962c920
2016-05-05 12:00:50 +01:00
Alan Viverette
1a1301286c Merge "Always assign leftover pixels to last weighted child" into nyc-dev
am: a11c21b412

* commit 'a11c21b41239c9101a2a1f4e5870b2f819d0e92d':
  Always assign leftover pixels to last weighted child

Change-Id: I80fbcb2d86b718bd02f7e0528bd498b894381502
2016-05-05 02:30:18 +00:00
Alan Viverette
a11c21b412 Merge "Always assign leftover pixels to last weighted child" into nyc-dev 2016-05-05 02:26:45 +00:00
Ruben Brunk
2d1a1a4521 Merge "Update VR API docs." into nyc-dev
am: 01d232988a

* commit '01d232988a69dfdee7f90cebf560686e458849e4':
  Update VR API docs.

Change-Id: I8e9d63e8ff6cab67b6c0def4f09a05fb03a23ecd
2016-05-04 23:41:38 +00:00