OSDN Git Service

android-x86/frameworks-base.git
6 years agoRename KeychainProtectionParameter to KeychainProtectionParams
Robert Berry [Wed, 17 Jan 2018 23:28:45 +0000 (23:28 +0000)]
Rename KeychainProtectionParameter to KeychainProtectionParams

Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Iab6d85d0be38e1a09ce78bb96b8f68493de65be9

6 years agoMerge "Clean up: remove drawer from root settings layout"
TreeHugger Robot [Thu, 18 Jan 2018 06:37:27 +0000 (06:37 +0000)]
Merge "Clean up: remove drawer from root settings layout"

6 years agoMerge "Add APIs to EuiccCardManager." am: a5bc474e2c am: f07319a6df
Holly Jiuyu Sun [Thu, 18 Jan 2018 04:28:28 +0000 (04:28 +0000)]
Merge "Add APIs to EuiccCardManager." am: a5bc474e2c am: f07319a6df
am: beacd5e4fa

Change-Id: I7aa42d89c69911137a86b86ee59463efe46a81c3

6 years agoMerge "Add "not congested" network capability." am: ffaddf73de am: abb158f712
Jeff Sharkey [Thu, 18 Jan 2018 04:20:44 +0000 (04:20 +0000)]
Merge "Add "not congested" network capability." am: ffaddf73de am: abb158f712
am: 1ed2bee762

Change-Id: I836fedeab34f34a43e0257e395fca1f735bc6d61

6 years agoMerge "Add APIs to EuiccCardManager." am: a5bc474e2c
Holly Jiuyu Sun [Thu, 18 Jan 2018 04:14:54 +0000 (04:14 +0000)]
Merge "Add APIs to EuiccCardManager." am: a5bc474e2c
am: f07319a6df

Change-Id: I71b5ea764f306a8a852f08a99f6a7247109e3511

6 years agoMerge "Add basic resolution of Private DNS hostname" am: a3bf36f050 am: 4218c522a7
Erik Kline [Thu, 18 Jan 2018 04:10:12 +0000 (04:10 +0000)]
Merge "Add basic resolution of Private DNS hostname" am: a3bf36f050 am: 4218c522a7
am: 0b250b6132

Change-Id: Iacdad88b49aff3e34afc93acfb8d3eeca9745c43

6 years agoMerge "Add "not congested" network capability." am: ffaddf73de
Jeff Sharkey [Thu, 18 Jan 2018 04:10:00 +0000 (04:10 +0000)]
Merge "Add "not congested" network capability." am: ffaddf73de
am: abb158f712

Change-Id: I2c7276bd657f5805c0b6492a216435270023a3c6

6 years agoMerge "Add basic resolution of Private DNS hostname" am: a3bf36f050
Erik Kline [Thu, 18 Jan 2018 04:02:46 +0000 (04:02 +0000)]
Merge "Add basic resolution of Private DNS hostname" am: a3bf36f050
am: 4218c522a7

Change-Id: Ifc776c67025925fbeb2c13038ae78061c32567f5

6 years agoMerge "Add APIs to EuiccCardManager."
Holly Jiuyu Sun [Thu, 18 Jan 2018 04:01:59 +0000 (04:01 +0000)]
Merge "Add APIs to EuiccCardManager."
am: a5bc474e2c

Change-Id: Ib0653ef73bb59f5dba2396bde20d1f29b107da86

6 years agoMerge "Add "not congested" network capability."
Jeff Sharkey [Thu, 18 Jan 2018 03:58:13 +0000 (03:58 +0000)]
Merge "Add "not congested" network capability."
am: ffaddf73de

Change-Id: I02ea25610df63b40547c3114c0f9a9ef59560e90

6 years agoMerge "Add basic resolution of Private DNS hostname"
Erik Kline [Thu, 18 Jan 2018 03:54:50 +0000 (03:54 +0000)]
Merge "Add basic resolution of Private DNS hostname"
am: a3bf36f050

Change-Id: I9ce3476d80b05c140a02aaf1c21d4da2a68a8909

6 years agoMerge "Add public API methods for private DNS." am: aacb56a7c0 am: f193c6d37d
Lorenzo Colitti [Thu, 18 Jan 2018 03:36:37 +0000 (03:36 +0000)]
Merge "Add public API methods for private DNS." am: aacb56a7c0 am: f193c6d37d
am: 7b212d3562

Change-Id: Icd04bc83624ea4d13ac7737e6f9a7b0c5f0f7314

6 years agoMerge "Add APIs to EuiccCardManager."
Holly Jiuyu Sun [Thu, 18 Jan 2018 03:32:22 +0000 (03:32 +0000)]
Merge "Add APIs to EuiccCardManager."

6 years agoMerge "Add "not congested" network capability."
Jeff Sharkey [Thu, 18 Jan 2018 03:28:34 +0000 (03:28 +0000)]
Merge "Add "not congested" network capability."

6 years agoMerge "Add public API methods for private DNS." am: aacb56a7c0
Lorenzo Colitti [Thu, 18 Jan 2018 03:27:51 +0000 (03:27 +0000)]
Merge "Add public API methods for private DNS." am: aacb56a7c0
am: f193c6d37d

Change-Id: I8d5a5b72c128231cca1dfb00bc00e887b5fbfc53

6 years agoMerge "Add public API methods for private DNS."
Lorenzo Colitti [Thu, 18 Jan 2018 03:21:02 +0000 (03:21 +0000)]
Merge "Add public API methods for private DNS."
am: aacb56a7c0

Change-Id: If2bdfb05fcb235888bf272e4cfddb14619fc3f78

6 years agoMerge "Add recent disk write speed metrics to Disk Stats"
TreeHugger Robot [Thu, 18 Jan 2018 02:50:48 +0000 (02:50 +0000)]
Merge "Add recent disk write speed metrics to Disk Stats"

6 years agoMerge "Add basic resolution of Private DNS hostname"
Treehugger Robot [Thu, 18 Jan 2018 02:44:53 +0000 (02:44 +0000)]
Merge "Add basic resolution of Private DNS hostname"

6 years agoMerge "Add video priority to Process.java"
TreeHugger Robot [Thu, 18 Jan 2018 02:29:23 +0000 (02:29 +0000)]
Merge "Add video priority to Process.java"

6 years agoMerge "Added internal API getMaxConnectedAudioDevices()" am: 877cbe1dc2 am: 18606e1601
Pavlin Radoslavov [Thu, 18 Jan 2018 02:25:31 +0000 (02:25 +0000)]
Merge "Added internal API getMaxConnectedAudioDevices()" am: 877cbe1dc2 am: 18606e1601
am: 9114a49770

Change-Id: I55d0175bb715dbd28176032ace129a2c85a218f0

6 years agoMerge "Added internal API getMaxConnectedAudioDevices()" am: 877cbe1dc2
Pavlin Radoslavov [Thu, 18 Jan 2018 02:18:03 +0000 (02:18 +0000)]
Merge "Added internal API getMaxConnectedAudioDevices()" am: 877cbe1dc2
am: 18606e1601

Change-Id: I58199a6c70bfa03fc515c573b936c78ec34d61ac

6 years agoMerge "Added internal API getMaxConnectedAudioDevices()"
Pavlin Radoslavov [Thu, 18 Jan 2018 02:10:31 +0000 (02:10 +0000)]
Merge "Added internal API getMaxConnectedAudioDevices()"
am: 877cbe1dc2

Change-Id: Ifb7b28f3993e3d8967886bdff006bcd2679d3277

6 years agoMerge "Add performance test for Debug.getPss()"
TreeHugger Robot [Thu, 18 Jan 2018 01:48:27 +0000 (01:48 +0000)]
Merge "Add performance test for Debug.getPss()"

6 years agoMerge "Reland: Move zygote's seccomp setup to post-fork" am: 7839672e22 am: 4249466562
Victor Hsieh [Thu, 18 Jan 2018 01:31:09 +0000 (01:31 +0000)]
Merge "Reland: Move zygote's seccomp setup to post-fork" am: 7839672e22 am: 4249466562
am: dec688691d

Change-Id: Ibcf5eeef74b69112f568ebb1f146c2990ffed30a

6 years agoMerge "Create exception hierarchy for RecoveryController"
TreeHugger Robot [Thu, 18 Jan 2018 01:25:58 +0000 (01:25 +0000)]
Merge "Create exception hierarchy for RecoveryController"

6 years agoMerge "Implements toString in NanoAppMessage/ContextHubMessage"
TreeHugger Robot [Thu, 18 Jan 2018 01:25:22 +0000 (01:25 +0000)]
Merge "Implements toString in NanoAppMessage/ContextHubMessage"

6 years agoMerge "Reland: Move zygote's seccomp setup to post-fork" am: 7839672e22
Victor Hsieh [Thu, 18 Jan 2018 01:23:32 +0000 (01:23 +0000)]
Merge "Reland: Move zygote's seccomp setup to post-fork" am: 7839672e22
am: 4249466562

Change-Id: Idbf4d7add5e41d2d01f4a3c2ff6e8f1b1735faeb

6 years agoMerge "Fixes null error for quick scrub when there is no home button"
TreeHugger Robot [Thu, 18 Jan 2018 01:21:25 +0000 (01:21 +0000)]
Merge "Fixes null error for quick scrub when there is no home button"

6 years agoMerge "Bluetooth in band ring" am: dbfaf31357 am: 8c73ee91f5
Joseph Pirozzo [Thu, 18 Jan 2018 01:19:19 +0000 (01:19 +0000)]
Merge "Bluetooth in band ring" am: dbfaf31357 am: 8c73ee91f5
am: 2746e9ab16

Change-Id: I2d43475d33c764b2b0951f7e4ddc969e8fce7c49

6 years agoMerge "Add public API methods for private DNS."
Lorenzo Colitti [Thu, 18 Jan 2018 01:17:17 +0000 (01:17 +0000)]
Merge "Add public API methods for private DNS."

6 years agoMerge "Reland: Move zygote's seccomp setup to post-fork"
Victor Hsieh [Thu, 18 Jan 2018 01:15:05 +0000 (01:15 +0000)]
Merge "Reland: Move zygote's seccomp setup to post-fork"
am: 7839672e22

Change-Id: I93275a50938ed1514fc690fe2e1390054748d361

6 years agoMerge "Implement text baseline attributes for TextView."
Abodunrinwa Toki [Thu, 18 Jan 2018 01:11:05 +0000 (01:11 +0000)]
Merge "Implement text baseline attributes for TextView."

6 years agoMerge "Bluetooth in band ring" am: dbfaf31357
Joseph Pirozzo [Thu, 18 Jan 2018 01:09:30 +0000 (01:09 +0000)]
Merge "Bluetooth in band ring" am: dbfaf31357
am: 8c73ee91f5

Change-Id: I1972da1da7bc0c001dc4525858bdb0e8bd5dd530

6 years agoMerge "Bluetooth in band ring"
Joseph Pirozzo [Thu, 18 Jan 2018 01:02:14 +0000 (01:02 +0000)]
Merge "Bluetooth in band ring"
am: dbfaf31357

Change-Id: I24b9169afc67e376a22c99f8a1ae7117549401f8

6 years agoClean up: remove drawer from root settings layout
Fan Zhang [Thu, 18 Jan 2018 00:49:23 +0000 (16:49 -0800)]
Clean up: remove drawer from root settings layout

This doesn't fix the bug about actionbar crash. It's just a cleanup in
the same area.

Bug: 72097389
Test: rebuilds
Change-Id: I5fd3847035c716d935ef9ccef490c074f01431d1

6 years agoMerge "Added internal API getMaxConnectedAudioDevices()"
Treehugger Robot [Thu, 18 Jan 2018 00:46:57 +0000 (00:46 +0000)]
Merge "Added internal API getMaxConnectedAudioDevices()"

6 years agoAdd APIs to EuiccCardManager.
Holly Jiuyu Sun [Fri, 22 Dec 2017 02:44:59 +0000 (18:44 -0800)]
Add APIs to EuiccCardManager.

The CL contains parts of the EuiccCard APIs. getEid() is sync. All the
other APIs are async.
Move ResetOptions from EuiccCard to EuiccCardManager.
The other APIs will be added in a follow-up CL.

Bug: 38206971
Test: test on phone
Change-Id: Iba098ee779b8ea4e244e0e4cf7318139666cc94b

6 years agoMerge "Add ability to post a message at the front of the queue"
Jorim Jaggi [Thu, 18 Jan 2018 00:19:20 +0000 (00:19 +0000)]
Merge "Add ability to post a message at the front of the queue"

6 years agoMerge "Wrapping remote app animations"
Jorim Jaggi [Thu, 18 Jan 2018 00:19:02 +0000 (00:19 +0000)]
Merge "Wrapping remote app animations"

6 years agoMerge "Add ability to register remote animation definitions per activity"
Jorim Jaggi [Thu, 18 Jan 2018 00:17:26 +0000 (00:17 +0000)]
Merge "Add ability to register remote animation definitions per activity"

6 years agoMerge "autofill: support dpad/keyboard"
Dake Gu [Thu, 18 Jan 2018 00:14:36 +0000 (00:14 +0000)]
Merge "autofill: support dpad/keyboard"

6 years agoMerge "Watchdog: add media.metrics" am: 6cb33a1b54 am: 701c4cd1cc
Andy Hung [Thu, 18 Jan 2018 00:12:12 +0000 (00:12 +0000)]
Merge "Watchdog: add media.metrics" am: 6cb33a1b54 am: 701c4cd1cc
am: 039d914a26

Change-Id: Icd718c2eb9b33382f73309738d65a24bb9f92b0b

6 years agoMerge "Watchdog: add media.metrics" am: 6cb33a1b54
Andy Hung [Thu, 18 Jan 2018 00:02:14 +0000 (00:02 +0000)]
Merge "Watchdog: add media.metrics" am: 6cb33a1b54
am: 701c4cd1cc

Change-Id: If5fb8cfe18e7fad089b5aec8e3168dab940826ec

6 years agoMerge "Reland: Move zygote's seccomp setup to post-fork"
Treehugger Robot [Wed, 17 Jan 2018 23:58:10 +0000 (23:58 +0000)]
Merge "Reland: Move zygote's seccomp setup to post-fork"

6 years agoMerge "Customize user switch dialog"
TreeHugger Robot [Wed, 17 Jan 2018 23:55:47 +0000 (23:55 +0000)]
Merge "Customize user switch dialog"

6 years agoMerge "Watchdog: add media.metrics"
Andy Hung [Wed, 17 Jan 2018 23:55:25 +0000 (23:55 +0000)]
Merge "Watchdog: add media.metrics"
am: 6cb33a1b54

Change-Id: I24992a0a7e4e4a67fba1c5202fc4e741a3952794

6 years agoMerge "Bluetooth in band ring"
Treehugger Robot [Wed, 17 Jan 2018 23:48:40 +0000 (23:48 +0000)]
Merge "Bluetooth in band ring"

6 years agoMerge "Merge "Add APIs to EuiccCardManager and EuiccCardController." am: 0797f4be58...
Android Build Merger (Role) [Wed, 17 Jan 2018 23:38:14 +0000 (23:38 +0000)]
Merge "Merge "Add APIs to EuiccCardManager and EuiccCardController." am: 0797f4be58 am: f09db036e5 am: 56a8d9ad4f"

6 years agoMerge "Add APIs to EuiccCardManager and EuiccCardController." am: 0797f4be58 am:...
Holly Jiuyu Sun [Wed, 17 Jan 2018 23:36:27 +0000 (23:36 +0000)]
Merge "Add APIs to EuiccCardManager and EuiccCardController." am: 0797f4be58 am: f09db036e5
am: 56a8d9ad4f

Change-Id: I02779540eaaf2ad934f5190c88296547c430df1a

6 years agoMerge "Fix API review javadoc issues in TextView/ExtractedText"
TreeHugger Robot [Wed, 17 Jan 2018 23:35:50 +0000 (23:35 +0000)]
Merge "Fix API review javadoc issues in TextView/ExtractedText"

6 years agoMerge "Added data service interface" am: 3965e3bbc6 am: 5f12e2c76d
Jack Yu [Wed, 17 Jan 2018 23:31:40 +0000 (23:31 +0000)]
Merge "Added data service interface" am: 3965e3bbc6 am: 5f12e2c76d
am: d3a8971bac

Change-Id: I6f8d26c56c1d709aa1c53ef49a133deca7555c7e

6 years agoMerge "Add APIs to EuiccCardManager and EuiccCardController." am: 0797f4be58
Holly Jiuyu Sun [Wed, 17 Jan 2018 23:25:13 +0000 (23:25 +0000)]
Merge "Add APIs to EuiccCardManager and EuiccCardController." am: 0797f4be58
am: f09db036e5

Change-Id: Ifcd39da6aafb4cd1e0b6e9e1baa38342a590fb91

6 years agoMerge "Integrate IMS Registration API" am: 1f00565433 am: f4d3a4d110
Brad Ebinger [Wed, 17 Jan 2018 23:23:09 +0000 (23:23 +0000)]
Merge "Integrate IMS Registration API" am: 1f00565433 am: f4d3a4d110
am: 7f47f8e957  -s ours

Change-Id: I23f49a34edb4cfee7bf4733f48e0a4b23943240f

6 years agoMerge "Added data service interface" am: 3965e3bbc6
Jack Yu [Wed, 17 Jan 2018 23:18:21 +0000 (23:18 +0000)]
Merge "Added data service interface" am: 3965e3bbc6
am: 5f12e2c76d

Change-Id: Iac4b6e1b86cdfa2e3285a086220b7c7aa921d7ff

6 years agoMerge "Add URL_DPC, URL_FILTERED and URL_ENFORCE_MANAGED as constants." am: b76029576...
yuemingw [Wed, 17 Jan 2018 23:14:19 +0000 (23:14 +0000)]
Merge "Add URL_DPC, URL_FILTERED and URL_ENFORCE_MANAGED as constants." am: b760295764 am: 10f60a740f
am: 0315d12976

Change-Id: I0510b82c525d3dd6b577ece470ba3e82e6b7568e

6 years agoMerge "Integrate IMS Registration API" am: 1f00565433
Brad Ebinger [Wed, 17 Jan 2018 23:13:46 +0000 (23:13 +0000)]
Merge "Integrate IMS Registration API" am: 1f00565433
am: f4d3a4d110

Change-Id: I19e812368d0afd5bd7934b4e3a2aa575d0c1d3a3

6 years agoMerge "Add APIs to EuiccCardManager and EuiccCardController."
Holly Jiuyu Sun [Wed, 17 Jan 2018 23:07:54 +0000 (23:07 +0000)]
Merge "Add APIs to EuiccCardManager and EuiccCardController."
am: 0797f4be58

Change-Id: Ie96bf09b698718705971bd94cd44f55e74700223

6 years agoMerge "Use "except-idle" whitelist for force-app-standby"
TreeHugger Robot [Wed, 17 Jan 2018 23:07:41 +0000 (23:07 +0000)]
Merge "Use "except-idle" whitelist for force-app-standby"

6 years agoMerge "Add URL_DPC, URL_FILTERED and URL_ENFORCE_MANAGED as constants." am: b760295764
yuemingw [Wed, 17 Jan 2018 23:05:16 +0000 (23:05 +0000)]
Merge "Add URL_DPC, URL_FILTERED and URL_ENFORCE_MANAGED as constants." am: b760295764
am: 10f60a740f

Change-Id: I7e00f153a147c906fe853c1f98e492a0c381850a

6 years agoMerge "Added data service interface"
Jack Yu [Wed, 17 Jan 2018 23:04:57 +0000 (23:04 +0000)]
Merge "Added data service interface"
am: 3965e3bbc6

Change-Id: I7543aff2abadb4c6b2556f37cd5e763cb5a8c08c

6 years agoImplements toString in NanoAppMessage/ContextHubMessage
Arthur Ishiguro [Sat, 6 Jan 2018 00:05:25 +0000 (16:05 -0800)]
Implements toString in NanoAppMessage/ContextHubMessage

Bug: 31069172
Test: Compile only
Change-Id: I1b59bcd0ff75d3824a136b903e5db0c15b55ccf5

6 years agoMerge "Integrate IMS Registration API"
Brad Ebinger [Wed, 17 Jan 2018 23:01:03 +0000 (23:01 +0000)]
Merge "Integrate IMS Registration API"
am: 1f00565433

Change-Id: I1bbbdbe612a154c9d13dd5d162e2149d3f94a958

6 years agoMerge "Add URL_DPC, URL_FILTERED and URL_ENFORCE_MANAGED as constants."
yuemingw [Wed, 17 Jan 2018 22:57:50 +0000 (22:57 +0000)]
Merge "Add URL_DPC, URL_FILTERED and URL_ENFORCE_MANAGED as constants."
am: b760295764

Change-Id: Ib7ff0f0854c164eb5044649a63bb113ec473609c

6 years agoMerge "pm: Verify shared-user priv-app install location"
TreeHugger Robot [Wed, 17 Jan 2018 22:47:44 +0000 (22:47 +0000)]
Merge "pm: Verify shared-user priv-app install location"

6 years agoMerge "Add feature flag for suggestions UI v2."
TreeHugger Robot [Wed, 17 Jan 2018 22:45:45 +0000 (22:45 +0000)]
Merge "Add feature flag for suggestions UI v2."

6 years agoautofill: support dpad/keyboard
Dake Gu [Wed, 27 Dec 2017 19:48:08 +0000 (11:48 -0800)]
autofill: support dpad/keyboard

To make autofill works on non-touch device such as TV, allow
fill ui window to gain window focus. Fill ui window does not
need IME. When IME and fill ui window are both shown, fill ui
window will intercept keyevent before IME.

Since autofill window will steal window focus from app window,
we no longer uses View.onWindowFocused() for enter/exit event.
Switched to use Activity onResume/onPause. When view
notifyViewEntered or notifyViewExited called when Activity is paused,
it will be ignored. Before Activity goes to pause state,
notifyViewExited() is fired on focus view, after Activity leaves
pause state, notifyViewEntered() is fired on focus view.

In CTS testDatasetAuthTwoFieldsUserCancelsFirstAttempt,  the
authentication activity finishes itself in onCreate() which will not
produce onPause/onResume in app activity, but it will produce window
focus loss/gain event. Since we switch from window focus to activity
onResume/onPause, we will be missing a show fill ui when return from
the never shown authentication activity. To solve this problem,
we added special code when receive ActivityResult from authentication
activity where we check if the authenticate activity never causes
onStop event, where we should issue an extra ACTION_VIEW_ENTERED
event to show fill ui.

Test: passed all existing autofilltest CTS on sailfish
      atest CtsAutoFillServiceTestCases
Bug: 70181616

Change-Id: Iafe4dca3be8f049fa6dfd34bac13ccb030c583b6

6 years agoMerge "Watchdog: add media.metrics"
Andy Hung [Wed, 17 Jan 2018 22:33:53 +0000 (22:33 +0000)]
Merge "Watchdog: add media.metrics"

6 years agoAdd performance test for Debug.getPss()
Arthur Eubanks [Mon, 18 Dec 2017 21:27:51 +0000 (13:27 -0800)]
Add performance test for Debug.getPss()

Test: m CorePerfTests
Test: adb install CorePerfTests.apk
Test: adb shell am instrument -w -e class android.os.PssPerfTest \
com.android.perftests.core/android.support.test.runner.AndroidJUnitRunner

Change-Id: Ia8cacb86c14b9956c9d526195d90848c678da6a6

6 years agoMerge "Add APIs to EuiccCardManager and EuiccCardController."
Holly Jiuyu Sun [Wed, 17 Jan 2018 22:26:58 +0000 (22:26 +0000)]
Merge "Add APIs to EuiccCardManager and EuiccCardController."

6 years agoMerge "Create Settings.Global.ENABLE_SMART_REPLIES_IN_NOTIFICATIONS setting"
TreeHugger Robot [Wed, 17 Jan 2018 22:15:52 +0000 (22:15 +0000)]
Merge "Create Settings.Global.ENABLE_SMART_REPLIES_IN_NOTIFICATIONS setting"

6 years agoMerge "Added data service interface"
Jack Yu [Wed, 17 Jan 2018 22:12:29 +0000 (22:12 +0000)]
Merge "Added data service interface"

6 years agoMerge "Add more logging to Activity Lifecycler."
Bryce Lee [Wed, 17 Jan 2018 22:03:04 +0000 (22:03 +0000)]
Merge "Add more logging to Activity Lifecycler."

6 years agoAdd ability to post a message at the front of the queue
Jorim Jaggi [Wed, 17 Jan 2018 21:59:33 +0000 (22:59 +0100)]
Add ability to post a message at the front of the queue

Used for remote animations to minimize latency.

Test: Boots
Bug: 64674361
Change-Id: Id07295a852edf4fbc308a4e4616077275f35f0f7

6 years agoMerge "Move BackupManagerServiceTest to Robolectric framework"
TreeHugger Robot [Wed, 17 Jan 2018 21:55:29 +0000 (21:55 +0000)]
Merge "Move BackupManagerServiceTest to Robolectric framework"

6 years agoMerge "Switch to SkAndroidCodec::computeSampleSize"
TreeHugger Robot [Wed, 17 Jan 2018 21:54:20 +0000 (21:54 +0000)]
Merge "Switch to SkAndroidCodec::computeSampleSize"

6 years agoMerge "Fix NPE when registering gesture support"
TreeHugger Robot [Wed, 17 Jan 2018 21:52:31 +0000 (21:52 +0000)]
Merge "Fix NPE when registering gesture support"

6 years agoCreate exception hierarchy for RecoveryController
Robert Berry [Wed, 17 Jan 2018 14:43:09 +0000 (14:43 +0000)]
Create exception hierarchy for RecoveryController

Sets up a sensible exception hierarchy. Consolidates two error codes
that both represented some kind of internal error into a single code.
Fixed some cases where the wrong error codes were used to signal.

Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I6b1f97715cdc28a4be79912abb6f48e6657b048b

6 years agoMerge "Add metadata to validate incoming administrator during transfer of ownership."
Antoan Angelov [Wed, 17 Jan 2018 21:32:15 +0000 (21:32 +0000)]
Merge "Add metadata to validate incoming administrator during transfer of ownership."

6 years agoWrapping remote app animations
Winson Chung [Tue, 5 Dec 2017 20:33:52 +0000 (12:33 -0800)]
Wrapping remote app animations

For use by launcher.

Test: Use it in launcher.

Bug: 64674361
Change-Id: Iaa67b349fc62ee2c636e27c270e336a767bec030

6 years agoMerge "Add metric for anomaly detection" into oc-mr1-dev am: 9b1211b353 -s ours
jackqdyulei [Wed, 17 Jan 2018 21:29:43 +0000 (21:29 +0000)]
Merge "Add metric for anomaly detection" into oc-mr1-dev am: 9b1211b353  -s ours
am: 839b467183  -s ours

Change-Id: Ibef8518a5a14537971a0d4bbc058e136d54d30af

6 years agoMerge "Add metric for anomaly detection" into oc-mr1-dev
jackqdyulei [Wed, 17 Jan 2018 21:21:57 +0000 (21:21 +0000)]
Merge "Add metric for anomaly detection" into oc-mr1-dev
am: 9b1211b353  -s ours

Change-Id: I1c7830ed2c956ed22682e7d0d03860f5fa7c7886

6 years agoAdd ability to register remote animation definitions per activity
Jorim Jaggi [Tue, 16 Jan 2018 13:17:59 +0000 (14:17 +0100)]
Add ability to register remote animation definitions per activity

This introduces a more stable way of setting a remote animation
than using overridePendingTransition: An activity can register
a set of remote animations which is broke down by transition type.
Whenever the activity is involved into such a transition, the
remote animation will be started.

Remote animations take precedence over regular animations, and
prefixOrderIndex in the hierarchy decides precedence within
multiple apps that set remote animation definitions such that
higher apps override lower apps.

Bug: 64674361
Test: go/wm-smoke
Test: Use with launcher
Change-Id: Id300ff62d9f60966ea2609168f6a02860b3de7af

6 years agoMerge "Merge "new carrier id APIs" am: 3d23b90874 am: 7537309843 am: ea5e2ad900 ...
Android Build Merger (Role) [Wed, 17 Jan 2018 20:58:41 +0000 (20:58 +0000)]
Merge "Merge "new carrier id APIs" am: 3d23b90874 am: 7537309843 am: ea5e2ad900  -s ours"

6 years agoMerge "new carrier id APIs" am: 3d23b90874 am: 7537309843
Chen Xu [Wed, 17 Jan 2018 20:57:31 +0000 (20:57 +0000)]
Merge "new carrier id APIs" am: 3d23b90874 am: 7537309843
am: ea5e2ad900  -s ours

Change-Id: I9c157b38bbf8c942bafdb1467d49091a7c3c7264

6 years agoMerge "Enable new initial-focus behavior for P"
Evan Rosky [Wed, 17 Jan 2018 20:56:24 +0000 (20:56 +0000)]
Merge "Enable new initial-focus behavior for P"

6 years agoMerge "Report more specific error if codec creation fails"
TreeHugger Robot [Wed, 17 Jan 2018 20:53:40 +0000 (20:53 +0000)]
Merge "Report more specific error if codec creation fails"

6 years agoMerge "Update the AID -> UID mapping."
TreeHugger Robot [Wed, 17 Jan 2018 20:53:35 +0000 (20:53 +0000)]
Merge "Update the AID -> UID mapping."

6 years agoMerge "IpSec - API Tweak for removeTransportModeTransform" am: 6725ff729b am: d58b237445
nharold [Wed, 17 Jan 2018 20:50:14 +0000 (20:50 +0000)]
Merge "IpSec - API Tweak for removeTransportModeTransform" am: 6725ff729b am: d58b237445
am: 723d0f061a

Change-Id: I479c24d9ac5d4b022ec6310395fdb4274cfd5598

6 years agoMerge "new carrier id APIs" am: 3d23b90874
Chen Xu [Wed, 17 Jan 2018 20:49:04 +0000 (20:49 +0000)]
Merge "new carrier id APIs" am: 3d23b90874
am: 7537309843

Change-Id: I8b64968ddb59304543eee89eb1e2dcb4d66517e3

6 years agoAdd public API methods for private DNS.
dalyk [Wed, 17 Jan 2018 19:20:55 +0000 (14:20 -0500)]
Add public API methods for private DNS.

Test: Small modifications to LinkProperties test.
Bug: 71828272
Change-Id: Id2f5acb5469132ec4a917837739f42085c71498e

6 years agoMerge "IpSec - API Tweak for removeTransportModeTransform" am: 6725ff729b
nharold [Wed, 17 Jan 2018 20:39:29 +0000 (20:39 +0000)]
Merge "IpSec - API Tweak for removeTransportModeTransform" am: 6725ff729b
am: d58b237445

Change-Id: Id9e9ab09669a53f53f03e5a6e0e4757434c3f3f3

6 years agoMerge "new carrier id APIs"
Chen Xu [Wed, 17 Jan 2018 20:38:27 +0000 (20:38 +0000)]
Merge "new carrier id APIs"
am: 3d23b90874

Change-Id: Ifaa9e4e2f4ec3ef9703c4bf58e8452a9920b350a

6 years agoMerge "Add metric for anomaly detection" into oc-mr1-dev
TreeHugger Robot [Wed, 17 Jan 2018 20:36:06 +0000 (20:36 +0000)]
Merge "Add metric for anomaly detection" into oc-mr1-dev

6 years agoMerge "IpSec - API Tweak for removeTransportModeTransform"
nharold [Wed, 17 Jan 2018 20:31:15 +0000 (20:31 +0000)]
Merge "IpSec - API Tweak for removeTransportModeTransform"
am: 6725ff729b

Change-Id: I0ed7128014bbca8973f84d719449dcf70da45fa2

6 years agoMerge "Integrate IMS Registration API"
Brad Ebinger [Wed, 17 Jan 2018 20:29:54 +0000 (20:29 +0000)]
Merge "Integrate IMS Registration API"

6 years agoFixes null error for quick scrub when there is no home button
Matthew Ng [Wed, 17 Jan 2018 20:28:41 +0000 (12:28 -0800)]
Fixes null error for quick scrub when there is no home button

Change-Id: I60c43009681d3e81442150f3c756eaa191619a67
Fixes: 72094006
Test: manual

6 years agoMerge "Deprecate android.software.vr.mode"
Craig Donner [Wed, 17 Jan 2018 20:20:51 +0000 (20:20 +0000)]
Merge "Deprecate android.software.vr.mode"

6 years agoMerge "aapt2: Fix issue with Manifest duplicate handling"
TreeHugger Robot [Wed, 17 Jan 2018 20:20:29 +0000 (20:20 +0000)]
Merge "aapt2: Fix issue with Manifest duplicate handling"

6 years agoMerge "Fix flaky schedule tests"
Julia Reynolds [Wed, 17 Jan 2018 20:16:52 +0000 (20:16 +0000)]
Merge "Fix flaky schedule tests"

6 years agoMerge "Use better names for associated classes of RecoveryManager"
TreeHugger Robot [Wed, 17 Jan 2018 20:04:55 +0000 (20:04 +0000)]
Merge "Use better names for associated classes of RecoveryManager"