OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Prevent quick scrub when dragging up"
TreeHugger Robot [Thu, 18 Jan 2018 11:08:33 +0000 (11:08 +0000)]
Merge "Prevent quick scrub when dragging up"

6 years agoMerge "Update the VaultParams encoding to reflect the recent change in the format...
TreeHugger Robot [Thu, 18 Jan 2018 11:08:26 +0000 (11:08 +0000)]
Merge "Update the VaultParams encoding to reflect the recent change in the format of vault_handle"

6 years agoMerge "Remove strings for wifi aggressive handover"
TreeHugger Robot [Thu, 18 Jan 2018 10:59:21 +0000 (10:59 +0000)]
Merge "Remove strings for wifi aggressive handover"

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 18 Jan 2018 10:56:28 +0000 (10:56 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 18 Jan 2018 10:53:27 +0000 (10:53 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Make sure to mutex around job-set iteration"
TreeHugger Robot [Thu, 18 Jan 2018 10:46:32 +0000 (10:46 +0000)]
Merge "Make sure to mutex around job-set iteration"

6 years agoMerge "Merge "Javadoc fixes to Time" am: b3c2efc615 am: b51c638a6c am: 90a56a59d5"
Android Build Merger (Role) [Thu, 18 Jan 2018 10:41:00 +0000 (10:41 +0000)]
Merge "Merge "Javadoc fixes to Time" am: b3c2efc615 am: b51c638a6c am: 90a56a59d5"

6 years agoMerge "Javadoc fixes to Time" am: b3c2efc615 am: b51c638a6c
Neil Fuller [Thu, 18 Jan 2018 10:40:42 +0000 (10:40 +0000)]
Merge "Javadoc fixes to Time" am: b3c2efc615 am: b51c638a6c
am: 90a56a59d5

Change-Id: I62545bdd0604ee0911249abd7628c99868093c77

6 years agoMerge "Use RecoverySession object to hide session IDs"
TreeHugger Robot [Thu, 18 Jan 2018 10:40:24 +0000 (10:40 +0000)]
Merge "Use RecoverySession object to hide session IDs"

6 years agoMerge "Rename Robo tests to BackupManagerServiceTest"
Annie Meng [Thu, 18 Jan 2018 10:34:07 +0000 (10:34 +0000)]
Merge "Rename Robo tests to BackupManagerServiceTest"

6 years agoMerge "Javadoc fixes to Time" am: b3c2efc615
Neil Fuller [Thu, 18 Jan 2018 10:31:35 +0000 (10:31 +0000)]
Merge "Javadoc fixes to Time" am: b3c2efc615
am: b51c638a6c

Change-Id: Ifea3eb9d25754155681b1f74096eacac1fa0b259

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 18 Jan 2018 10:27:57 +0000 (10:27 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "KeyStore: Remove duplicate method"
TreeHugger Robot [Thu, 18 Jan 2018 10:26:44 +0000 (10:26 +0000)]
Merge "KeyStore: Remove duplicate method"

6 years agoMerge "Javadoc fixes to Time"
Neil Fuller [Thu, 18 Jan 2018 10:26:13 +0000 (10:26 +0000)]
Merge "Javadoc fixes to Time"
am: b3c2efc615

Change-Id: I9793670f518d15fc42caa01a519c33e451998a77

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 18 Jan 2018 10:20:39 +0000 (10:20 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Rename KeychainProtectionParameter to KeychainProtectionParams"
TreeHugger Robot [Thu, 18 Jan 2018 10:09:09 +0000 (10:09 +0000)]
Merge "Rename KeychainProtectionParameter to KeychainProtectionParams"

6 years agoMerge "Adjust file reference type in 'aapt2 convert'"
David Chaloupka [Thu, 18 Jan 2018 10:06:01 +0000 (10:06 +0000)]
Merge "Adjust file reference type in 'aapt2 convert'"

6 years agoMerge "Promote DISALLOW_RUN_IN_BACKGROUND to SystemAPI"
TreeHugger Robot [Thu, 18 Jan 2018 09:26:37 +0000 (09:26 +0000)]
Merge "Promote DISALLOW_RUN_IN_BACKGROUND to SystemAPI"

6 years agoMerge "Javadoc fixes to Time"
Neil Fuller [Thu, 18 Jan 2018 09:18:27 +0000 (09:18 +0000)]
Merge "Javadoc fixes to Time"

6 years agoUse RecoverySession object to hide session IDs
Robert Berry [Wed, 17 Jan 2018 14:16:39 +0000 (14:16 +0000)]
Use RecoverySession object to hide session IDs

Session IDs are an implementation detail that the framework can (and should)
abstract away.

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

Change-Id: Ieba641a9b54ac9bba197a6e9749b621a07e40c67

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 agoUpdate the VaultParams encoding to reflect the recent change in the
Bo Zhu [Thu, 18 Jan 2018 01:34:26 +0000 (17:34 -0800)]
Update the VaultParams encoding to reflect the recent change in the
format of vault_handle

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

Change-Id: I105d17ac87b70795fa977b7649c7a1fdcb97b5e9

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 18 Jan 2018 07:23:21 +0000 (23:23 -0800)]
Import translations. DO NOT MERGE

Change-Id: I187ddfcd5388173662e45da5ef3f19a1d17be32c
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 18 Jan 2018 07:19:59 +0000 (23:19 -0800)]
Import translations. DO NOT MERGE

Change-Id: I8457b08b667801127c2bb943639a4ea2ff86de05
Auto-generated-cl: translation import

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 agoImport translations. DO NOT MERGE
Bill Yi [Thu, 18 Jan 2018 06:25:01 +0000 (22:25 -0800)]
Import translations. DO NOT MERGE

Change-Id: I6b13005d123462b08911d4fec5600311fccf9dee
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 18 Jan 2018 05:55:22 +0000 (21:55 -0800)]
Import translations. DO NOT MERGE

Change-Id: I1840cf7401e12dbfc7624e4ffd155f903fb59e36
Auto-generated-cl: translation import

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 agoRemove strings for wifi aggressive handover
Michael Plass [Thu, 18 Jan 2018 01:04:45 +0000 (17:04 -0800)]
Remove strings for wifi aggressive handover

Bug: 72063774
Test: m RunSettingsRoboTests -j 40
Change-Id: Id5de185870b48a65b2e10106478ac0a9803b2fbc

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 agoPrevent quick scrub when dragging up
Matthew Ng [Wed, 17 Jan 2018 23:32:41 +0000 (15:32 -0800)]
Prevent quick scrub when dragging up

When leaving the touch slop in the perpendicular direction of quick
scrub, remove the timeout to start quickscrub so launcher can continue
to handle touch events.

Bug: 67957962
Bug: 70180755
Test: manual - drag up with quick step enabled
Change-Id: Icb5fcd992b17ac05402b83543115e6ab34475d2f

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 agoMake sure to mutex around job-set iteration
Christopher Tate [Wed, 17 Jan 2018 22:40:38 +0000 (14:40 -0800)]
Make sure to mutex around job-set iteration

If something mucks with the job set while we're iterating through
it, we're going to have a bad day.

Change-Id: I2e5603f4dd025b2e1819c7e84d59882bad98ae7a
Fixes: 72105511
Test: atest CtsJobSchedulerTestCases
Test: atest FrameworksServicesTests:com.android.server.job.BackgroundRestrictionsTest

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."