Commit Graph

55928 Commits

Author SHA1 Message Date
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
Paul Miller
8a6aea047d Merge "Fix WebView Metrics opt out Javadoc formatting" into nyc-dev 2016-02-24 18:25:18 +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
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
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
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
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
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
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
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
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
Clara Bayarri
aa83d163aa Merge "Make FingerprintManager#hasEnrolledFingerprints per-user" into nyc-dev 2016-02-24 01:31:02 +00:00
Dianne Hackborn
1085ff6ee5 Work towards issue #26390161: Throttle syncs/jobs when system is low on RAM
First, we need to make the job scheduler prioritize jobs for
foreground apps over background apps (so we will degrade well
when we are limiting the number of concurrent jobs).

So now the job scheduler keeps track of the process state of
each uid, and uses that to bump up the priority of jobs
associated with foreground uids.  Added constants for priorities
since we have different places specifying priorities.

Also cleaned up a bit of the reporting of "wrapped" jobs from
the sync manager -- there is a new tag argument that can be supplied,
to have the name and tag used in various places be based on that
instead of the useless internal class name.

Change-Id: I8781750ddfac1472a98e1873fc38c014425db3d6
2016-02-23 17:04:58 -08:00
Fyodor Kupolov
0bf96d30e7 Merge "Disable switching users until user 0 is unlocked" into nyc-dev
am: 598255ae02

* commit '598255ae02752f06acf86db30f4e0f5655d2ea96':
  Disable switching users until user 0 is unlocked
2016-02-24 01:01:10 +00:00
Fyodor Kupolov
598255ae02 Merge "Disable switching users until user 0 is unlocked" into nyc-dev 2016-02-24 00:51:11 +00:00
Clara Bayarri
33fd3cf2d9 Make FingerprintManager#hasEnrolledFingerprints per-user
Needed by Settings to determine if the work profile has fingerprints

Bug: 27263452
Change-Id: Ic54f59461b44a525284f6a1ab3d17627c652f842
2016-02-23 16:49:58 -08:00
Doris Liu
3c4f36daac Merge "Support running AVD on UI thread" into nyc-dev
am: 3005843506

* commit '30058435065f392754e749fe43589dd8b452727d':
  Support running AVD on UI thread
2016-02-23 23:01:46 +00:00
Doris Liu
3005843506 Merge "Support running AVD on UI thread" into nyc-dev 2016-02-23 22:43:53 +00:00
Doris Liu
28cfd20f02 Support running AVD on UI thread
By default, AVD animates on RT thread. But since in some cases there's a
need for a finer control on when the frame update for the animation should
happen, such as coordiating the AVD animation with other animations that
run on UI thread, we are providing a way to force the AVD to run on UI
thread.

Bug: 27278616
Change-Id: I372ecd3dc52e3fa0bdce3a1e9c19443f9b199027
2016-02-23 14:40:47 -08:00
Paul Miller
9aca9aecab Fix WebView Metrics opt out Javadoc formatting
BUG:27305383
Change-Id: I23afa271058479263abe714f1a3493562f0cfe9e
2016-02-23 13:39:19 -08:00
Joe Onorato
1ba39aa54e Merge changes I4e45afed,I2ea19f9a,I922d6f38 into nyc-dev
am: 62b9ff4994

* commit '62b9ff49947ccfca7d9f2ffe0e34006821080819':
  Add unit tests for BatteryStatsImpl.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
2016-02-23 21:24:01 +00:00
Jeff Sharkey
2b2974dcef Merge "Offer to cache ringtones in system DE storage." into nyc-dev
am: 1ce5c28ba5

* commit '1ce5c28ba54f31c0013542df81975148657b8229':
  Offer to cache ringtones in system DE storage.
2016-02-23 21:12:27 +00:00
Joe Onorato
62b9ff4994 Merge changes I4e45afed,I2ea19f9a,I922d6f38 into nyc-dev
* changes:
  Add unit tests for BatteryStatsImpl.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
2016-02-23 21:06:23 +00:00
Jeff Sharkey
1ce5c28ba5 Merge "Offer to cache ringtones in system DE storage." into nyc-dev 2016-02-23 20:57:46 +00:00
Joe Onorato
abded113bd Add unit tests for BatteryStatsImpl.
- Add a Clocks interface to wrap SystemClock.uptimeMillis and
  SystemClock.elapsedRealtime.
- Make the inner classes static so they can be created independently,
  which meant passing explicit pointers to the BatteryStatsImpl and
  the Uid objects in a lot of places.
- Make several fields protected so they can be accessed by the tests (they are
  still @hidden)
- Add a test suite for the battery stats.
- Add the tests

Change-Id: I4e45afedc64f7050985c28a7eb4f5c1ddbaa63fa
2016-02-23 12:44:22 -08:00
Alan Viverette
cadb829532 Merge "Remove @Nullable annotation from getDrawable() methods" into nyc-dev
am: 0df7c98adf

* commit '0df7c98adf75e2f8a176e742e1bb325aee2808e6':
  Remove @Nullable annotation from getDrawable() methods
2016-02-23 20:34:58 +00:00
Alan Viverette
0df7c98adf Merge "Remove @Nullable annotation from getDrawable() methods" into nyc-dev 2016-02-23 20:30:08 +00:00
Jeff Sharkey
413573ac59 Offer to cache ringtones in system DE storage.
Ringtones often live on shared media, which is now encrypted with CE
keys and not available until after the user is unlocked.  To improve
the user experience while locked, cache the default ringtone,
notification sound, and alarm sound in a DE storage area.

Bug: 26730753
Change-Id: Ie6ad7790af4c87dd25759df3ed017e3b91a2fb87
2016-02-23 13:27:00 -07:00
Alan Viverette
fde0213716 Remove @Nullable annotation from getDrawable() methods
Developers usually do not need to check the result of getDrawable(), so
we shouldn't be annotating it like they do.

Bug: 27134828
Change-Id: I0db0ca806fd89c18781da452fe3f31ef344f3cca
2016-02-23 14:59:51 -05:00
Fyodor Kupolov
07140f7ffd Disable switching users until user 0 is unlocked
Switching with user0 locked can be re-enabled by setting
allow_user_switching_when_system_user_locked flag to a non-zero value

Bug: 26933989
Change-Id: I0958058f1cc8a059db9c20930e07183c14c8460a
2016-02-23 11:58:54 -08:00
John Reck
5962a84e5f Merge "destroyHardwareResources in onStop()" into nyc-dev
am: e5bfd2da4d

* commit 'e5bfd2da4d60c90a137a1eb883802c13ae53273e':
  destroyHardwareResources in onStop()
2016-02-23 19:52:41 +00:00
Chien-Yu Chen
d1733607cd Merge "Camera2: Fix getInternalFormatSizes for depth" into nyc-dev 2016-02-23 19:52:20 +00:00
John Reck
e5bfd2da4d Merge "destroyHardwareResources in onStop()" into nyc-dev 2016-02-23 19:45:09 +00:00
Tao Bai
8ecca7d7f7 Merge "Using addAssetPathAsSharedLibrary in WebViewDelegate" into nyc-dev
am: eabebc1539

* commit 'eabebc1539b7e8b412da33c9e462665087cb1bfc':
  Using addAssetPathAsSharedLibrary in WebViewDelegate
2016-02-23 18:57:32 +00:00
Andres Morales
74e9b18b2d Add SystemApi for retrieving device flash lock state
Bug: 26039090
Change-Id: Ib51c4862d897cc91a0788379c761ed49a2adf271
2016-02-23 10:53:49 -08:00
Tao Bai
eabebc1539 Merge "Using addAssetPathAsSharedLibrary in WebViewDelegate" into nyc-dev 2016-02-23 18:52:15 +00:00