Commit Graph

56128 Commits

Author SHA1 Message Date
Amith Yamasani
4e7188169d Merge "Optimize calls to TelephonyManager to check for privileged apps" into nyc-dev am: 66f0c6f3b8
am: 056454791e

* commit '056454791e370b83a98ffd9c7d88b2693644cb6a':
  Optimize calls to TelephonyManager to check for privileged apps
2016-02-24 19:59:09 +00:00
Sergey Poromov
e5ffeb4244 Merge "Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()" into nyc-dev am: 54aaeb72e9
am: 83c62153c7

* commit '83c62153c729b3b2cfd62a86457ab6238de2cc55':
  Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()
2016-02-24 19:56:54 +00:00
Amith Yamasani
056454791e Merge "Optimize calls to TelephonyManager to check for privileged apps" into nyc-dev
am: 66f0c6f3b8

* commit '66f0c6f3b8bde3ba224a1333a4acbf1b86c959ec':
  Optimize calls to TelephonyManager to check for privileged apps
2016-02-24 19:52:56 +00:00
Sergey Poromov
83c62153c7 Merge "Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()" into nyc-dev
am: 54aaeb72e9

* commit '54aaeb72e9c4cfad94c55ea2b66815d8541b7073':
  Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()
2016-02-24 19:50:38 +00:00
Amith Yamasani
66f0c6f3b8 Merge "Optimize calls to TelephonyManager to check for privileged apps" into nyc-dev 2016-02-24 19:42:12 +00:00
Sergey Poromov
54aaeb72e9 Merge "Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()" into nyc-dev 2016-02-24 19:40:53 +00:00
Adam Powell
1275fcacf6 Merge "Un-hide string set persistence methods in Preference" into nyc-dev am: 475aa109dc
am: 75549d01bf

* commit '75549d01bf0ca3e28fc1e8f2ef6b9d08e686048d':
  Un-hide string set persistence methods in Preference
2016-02-24 19:34:53 +00:00
Amith Yamasani
4ec6368f13 Optimize calls to TelephonyManager to check for privileged apps
Calling into TelephonyManager each of hundreds of apps to check
if the app is carrier privileged was very expensive, especially
when there aren't even any carrier access rules specified. This
change fetches all the carrier privileged apps in one call,
reducing the number of IPC calls to the radio process and checks
the package names locally.

If the carrier rules change or packages are modified, the list
will be computed and fetched again.

Other optimizations in Telephony help speed up the individual calls
to check if a package is privileged, as well.

Bug: 27271861
Change-Id: I5a77b6da4f2cdc603d2a73bd8569c5c38f06b42d
2016-02-24 11:30:00 -08:00
Adam Powell
75549d01bf Merge "Un-hide string set persistence methods in Preference" into nyc-dev
am: 475aa109dc

* commit '475aa109dc78cc45eb76307dea5e54c4e9f44d5b':
  Un-hide string set persistence methods in Preference
2016-02-24 19:24:10 +00:00
Gustav Sennton
dd6058205a Merge "Add fallback packages to be enabled iff no webview packages are valid" into nyc-dev am: 074d630f9e
am: 36bf2f9bdd

* commit '36bf2f9bddba6480ded0bb7ad56e27be94e058e9':
  Add fallback packages to be enabled iff no webview packages are valid
2016-02-24 19:23:36 +00:00
Adam Powell
475aa109dc Merge "Un-hide string set persistence methods in Preference" into nyc-dev 2016-02-24 19:13:55 +00:00
Gustav Sennton
36bf2f9bdd Merge "Add fallback packages to be enabled iff no webview packages are valid" into nyc-dev
am: 074d630f9e

* commit '074d630f9e7a4dfd8acf3fa4fa1dfcb500184156':
  Add fallback packages to be enabled iff no webview packages are valid
2016-02-24 19:10:12 +00:00
Gustav Sennton
074d630f9e Merge "Add fallback packages to be enabled iff no webview packages are valid" into nyc-dev 2016-02-24 19:00:36 +00:00
Sergey Poromov
899edf6f4f Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()
BackupManagerService has the null check, but it doesn't work
because passed BackupObserver object is wrapped into
this BackupObserverWrapper.
This was found during GTS testing.

Bug: 27334738
Change-Id: I16dc0230824b326d3fae1f8489f58b0c0d4e1c7c
2016-02-24 19:36:26 +01:00
Paul Miller
02f69efcd5 Merge "Fix WebView Metrics opt out Javadoc formatting" into nyc-dev am: 8a6aea047d
am: d3488a313e

* commit 'd3488a313e7b23074e2199e5e3d131dfd8b452b8':
  Fix WebView Metrics opt out Javadoc formatting
2016-02-24 18:35:32 +00:00
Paul Miller
d3488a313e Merge "Fix WebView Metrics opt out Javadoc formatting" into nyc-dev
am: 8a6aea047d

* commit '8a6aea047ddc484a9f3cc769c771f73ae2553ff6':
  Fix WebView Metrics opt out Javadoc formatting
2016-02-24 18:29:24 +00:00
Jorim Jaggi
f60b2cc9c6 Always consume bottom insets when navigation bar is force shown am: 0ffd49cbe0
am: f941f60f9b

* commit 'f941f60f9b908951a63e78c97ad197261ffbeb21':
  Always consume bottom insets when navigation bar is force shown
2016-02-24 18:28:01 +00:00
Paul Miller
8a6aea047d Merge "Fix WebView Metrics opt out Javadoc formatting" into nyc-dev 2016-02-24 18:25:18 +00:00
Robin Lee
a1f36e58b6 Merge "DPM: installKeyPair variant: caller can self-grant" into nyc-dev am: 155a280e18
am: 589e36e10a

* commit '589e36e10ad8406095a77a029b2871be63fd4c0c':
  DPM: installKeyPair variant: caller can self-grant
2016-02-24 18:23:53 +00:00
Jorim Jaggi
f941f60f9b Always consume bottom insets when navigation bar is force shown
am: 0ffd49cbe0

* commit '0ffd49cbe0ab4c13fd5528abacade898a8cff481':
  Always consume bottom insets when navigation bar is force shown
2016-02-24 18:23:20 +00:00
Robin Lee
589e36e10a Merge "DPM: installKeyPair variant: caller can self-grant" into nyc-dev
am: 155a280e18

* commit '155a280e18200aeaa0e7d5e31d6b8b0115c58e42':
  DPM: installKeyPair variant: caller can self-grant
2016-02-24 18:18:55 +00:00
Jorim Jaggi
0ffd49cbe0 Always consume bottom insets when navigation bar is force shown
When an app requests SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION but we
force show the navigation bar, we need to treat for the app like
there is no virtual navigation bar on the device. Because if you
combine it with FLAG_HIDE_NAVIGATION, you'd expect the navigation
bar gets hidden but it doesn't, so there could be content that
overlaps with the navigation bar.

Bug: 27157904
Change-Id: I088e02eae2e723c35e9cb4873de6b1325458533b
2016-02-24 18:15:17 +00:00
Robin Lee
155a280e18 Merge "DPM: installKeyPair variant: caller can self-grant" into nyc-dev 2016-02-24 18:14:36 +00:00
Dianne Hackborn
fe60596ff1 Merge "Work towards issue #26390161: Throttle syncs/jobs when system is low on RAM" into nyc-dev am: 11007fa30c
am: f6461b288e

* commit 'f6461b288eec466bd82439f5b5bdfec28483bb68':
  Work towards issue #26390161: Throttle syncs/jobs when system is low on RAM
2016-02-24 18:09:44 +00:00
Dianne Hackborn
f6461b288e Merge "Work towards issue #26390161: Throttle syncs/jobs when system is low on RAM" into nyc-dev
am: 11007fa30c

* commit '11007fa30c139935a93c520236800e64891b0f33':
  Work towards issue #26390161: Throttle syncs/jobs when system is low on RAM
2016-02-24 18:02:43 +00:00
Dianne Hackborn
11007fa30c Merge "Work towards issue #26390161: Throttle syncs/jobs when system is low on RAM" into nyc-dev 2016-02-24 18:00:28 +00:00
Andres Morales
242a841964 Merge "Add SystemApi for retrieving device flash lock state" into nyc-dev am: f1af917c14
am: a200a0ba56

* commit 'a200a0ba56e5aa096e254639944d3783ed0774a3':
  Add SystemApi for retrieving device flash lock state
2016-02-24 17:37:43 +00:00
Andres Morales
a200a0ba56 Merge "Add SystemApi for retrieving device flash lock state" into nyc-dev
am: f1af917c14

* commit 'f1af917c14677ac4178efa90a1cd6df52d1b4ec9':
  Add SystemApi for retrieving device flash lock state
2016-02-24 17:33:05 +00:00
Andres Morales
f1af917c14 Merge "Add SystemApi for retrieving device flash lock state" into nyc-dev 2016-02-24 17:30:26 +00:00
Robin Lee
ce3399fbb4 DPM: installKeyPair variant: caller can self-grant
If 'requestAccess' is true, the caller (either profile/device owner or a
designated certificate installer) will be granted usage of the keypair
on successful installation.

This has no security implications for a profile/device owner which would
already be able to self-grant. Delegated certificate installers did not
have this ability before.

This is only allowed at install-time- not afterward.

Bug: 24746231
Change-Id: Ia0ec290bb0bcde1d8137c188e2667cb7718dbfd7
2016-02-24 17:14:41 +00:00
Jason Monk
c2c8ac7c42 Merge "Add constant to link to app\'s general settings" into nyc-dev am: 6a723f73bd
am: 5853d81a46

* commit '5853d81a46bda8276cc26985198aef4bdaed31dc':
  Add constant to link to app's general settings
2016-02-24 16:32:14 +00:00
Jason Monk
5853d81a46 Merge "Add constant to link to app\'s general settings" into nyc-dev
am: 6a723f73bd

* commit '6a723f73bde3174ab83956804e22ef56c6ace581':
  Add constant to link to app's general settings
2016-02-24 16:28:07 +00:00
Jason Monk
2f68e8a62a Add constant to link to app's general settings
Bug: 27276982
Change-Id: Ia438faeb12b24251bb74919f680713a7bc03e0b5
2016-02-24 10:25:42 -05:00
Lenka Trochtova
a6791cc935 Merge "Prevent ephemeral user from being re-entered after stop." into nyc-dev am: cfdc99ef5e
am: e8a4797e00

* commit 'e8a4797e003b6e8bb747d033b06c173402c5be96':
  Prevent ephemeral user from being re-entered after stop.
2016-02-24 12:40:45 +00:00
Lenka Trochtova
e8a4797e00 Merge "Prevent ephemeral user from being re-entered after stop." into nyc-dev
am: cfdc99ef5e

* commit 'cfdc99ef5e542f61cd405132fc140b14d9ec1620':
  Prevent ephemeral user from being re-entered after stop.
2016-02-24 12:38:00 +00:00
Lenka Trochtova
cfdc99ef5e Merge "Prevent ephemeral user from being re-entered after stop." into nyc-dev 2016-02-24 12:34:58 +00:00
Lenka Trochtova
1ddda4793c Prevent ephemeral user from being re-entered after stop.
Once the ephemeral user stops, the user's deletion is scheduled.
It takes a while before the user actually disappears and it is not
desirable for the user to be re-entered in the meantime.
Mark the user as disabled on stop and check this flag
in the activity manager to prevent the user from being switched
to again. Also hide the user from user-switching UI.

BUG: 26795729
BUG: 26780152

Change-Id: I83a61674958954b5a210114b88ffa5ae55922c1f
2016-02-24 11:55:58 +01:00
Rubin Xu
371ffaef71 Merge "Clarify javadoc for SecurityLog" into nyc-dev am: 61ea6d0bbf
am: 576e4b8120

* commit '576e4b8120aaaacd3709fcb1ff61b2b6fb10cd1f':
  Clarify javadoc for SecurityLog
2016-02-24 10:38:14 +00:00
Rubin Xu
576e4b8120 Merge "Clarify javadoc for SecurityLog" into nyc-dev
am: 61ea6d0bbf

* commit '61ea6d0bbfeb88eef5096fa985f819d51f32db82':
  Clarify javadoc for SecurityLog
2016-02-24 10:35:32 +00:00
Rubin Xu
61ea6d0bbf Merge "Clarify javadoc for SecurityLog" into nyc-dev 2016-02-24 10:31:36 +00:00
Lorenzo Colitti
799a057a6b resolve merge conflicts of 51e4acb29d to nyc-dev am: 1142b2654a
am: 86b5635540

* commit '86b5635540970fe49cb2e35926f229984221d0c2':
  Add Connectivity Metrics Logger service
2016-02-24 06:44:31 +00:00
Lorenzo Colitti
86b5635540 resolve merge conflicts of 51e4acb29d to nyc-dev
am: 1142b2654a

* commit '1142b2654ae36b54a61bfe759f2f43a01532ae93':
  Add Connectivity Metrics Logger service
2016-02-24 06:37:35 +00:00
Lorenzo Colitti
1142b2654a resolve merge conflicts of 51e4acb29d to nyc-dev
Also add the appropriate changes to api/test-current.txt, which
is not present on mm-wireless-dev from which this change came.

Change-Id: Ic4df6d0f89add73b7e5252ef662de07a4e8fce31
2016-02-24 15:19:15 +09:00
Pierre Imai
51e4acb29d Merge "Add Connectivity Metrics Logger service" into mm-wireless-dev 2016-02-24 04:49:24 +00:00
Jeff Sharkey
c0bd9a7f98 Merge "Update accessibility to be encryption-aware." into nyc-dev am: 1082306709
am: 6008bb5488

* commit '6008bb54881216d10fa6281fffabfeb94144b3c3':
  Update accessibility to be encryption-aware.
2016-02-24 03:29:21 +00:00
Jeff Sharkey
6008bb5488 Merge "Update accessibility to be encryption-aware." into nyc-dev
am: 1082306709

* commit '10823067099642c7f6bf186d3c83960ac9f67c5a':
  Update accessibility to be encryption-aware.
2016-02-24 03:22:40 +00:00
Jeff Sharkey
1082306709 Merge "Update accessibility to be encryption-aware." into nyc-dev 2016-02-24 03:17:11 +00:00
Jeff Sharkey
e88e266547 Update accessibility to be encryption-aware.
Look for both EA and non-EA accessibility services, but when the user
is locked only bind to EA services.  Once the user is unlocked, we
take another pass and bind to any non-EA services.

We only consider disabling accessibility once the user is unlocked,
since there could be non-EA services waiting in the wings.

Bug: 25860579
Change-Id: I97bd019661457c3577d629ba12290d02f026011a
2016-02-23 20:15:15 -07:00
Clara Bayarri
4e516daab2 Merge "Make FingerprintManager#hasEnrolledFingerprints per-user" into nyc-dev am: aa83d163aa
am: 8a217eba48

* commit '8a217eba48f08a8a55d74c7b23fde5ef70fb2a1e':
  Make FingerprintManager#hasEnrolledFingerprints per-user
2016-02-24 01:42:59 +00:00
Clara Bayarri
8a217eba48 Merge "Make FingerprintManager#hasEnrolledFingerprints per-user" into nyc-dev
am: aa83d163aa

* commit 'aa83d163aa93b8a4f267e8fc434a3916f540d561':
  Make FingerprintManager#hasEnrolledFingerprints per-user
2016-02-24 01:36:27 +00:00