352862 Commits

Author SHA1 Message Date
TreeHugger Robot
6a6a0b2fc8 Merge "Camera: Add support for session parameters" 2017-12-22 19:18:49 +00:00
TreeHugger Robot
14cddc465b Merge "Implement generateAndStoreKey" 2017-12-22 19:10:24 +00:00
TreeHugger Robot
25f5d01738 Merge "Modify Loadtest app to be able to exclude certain metric types." 2017-12-22 18:44:21 +00:00
TreeHugger Robot
bd8d1a5330 Merge "Update recoverKeys to return raw material" 2017-12-22 18:40:28 +00:00
jackqdyulei
65d113653c Read paired device After LocalBtManager is created
After this cl, it could guarantee that device list always has
saved devices:
1. Even though in onCreate(Fix flaky UI)
2. Even though there is no other bluetooth event to trigger it
(e.g. no device is connecting)

Fixes: 70934171
Fixes: 63910184
Test: Build
Change-Id: Iec628d455690a68d92f201f6eac9cd97b555b2b4
2017-12-22 10:32:44 -08:00
Android Build Merger (Role)
749713e408 Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3a8be1ae39 -s ours am: cb562a40d9 -s ours am: 323dc6b0d0 -s ours" 2017-12-22 18:17:42 +00:00
Bill Yi
a7fc54d92c Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3a8be1ae39 -s ours am: cb562a40d9 -s ours
am: 323dc6b0d0  -s ours

Change-Id: I424a05d1e3a20b4d40af3c3f7935c7c81579fbdf
2017-12-22 18:17:21 +00:00
Siyamed Sinir
4e6308dd36 Merge "Fix TextViewTest.testFallbackLineSpacing on small devices" 2017-12-22 18:16:54 +00:00
Bill Yi
323dc6b0d0 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3a8be1ae39 -s ours
am: cb562a40d9  -s ours

Change-Id: Iba2031a23c32e6ad748339ae7e2107bea8f80eb2
2017-12-22 18:11:27 +00:00
Fan Zhang
d2b4419ebd Add feature flag for security settings v2.
Bug:  32953042
Test: rebuild
Change-Id: Iabfd4705f01cf8a1ca1a3374de3d5a31850ae681
2017-12-22 10:03:00 -08:00
Bill Yi
cb562a40d9 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 3a8be1ae39  -s ours

Change-Id: I2bfbaa9cc6b920112bc71a0b76b1382eb9d68e95
2017-12-22 18:02:46 +00:00
TreeHugger Robot
3a8be1ae39 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-12-22 17:57:02 +00:00
Janis Danisevskis
03dd82792e Add importWrappedKey to IKeystoreService.aidl
Test: pending
Bug: 63931634
Change-Id: If7fde024f9388bd85045902761d8fa7bf1c42e7d
2017-12-22 17:44:04 +00:00
susanta.patra
a2c1917e37 Fixed RTL alignment issue in suggested language list
Suggested language list alignment should be as per the default locale.

Test: 1. RTL language
      2. Settings>System>Languages & input>Languages>Add a language>English
      3. Check the alignment
Bug: 70360392

Change-Id: I934b1061fb897ac69270a493562defba4a5a1a35
Signed-off-by: susanta.patra <susanta.patra@lge.com>
2017-12-22 09:41:30 -08:00
TreeHugger Robot
79fb153bc8 Merge "Do not skip broadcast if the parent user is running" 2017-12-22 17:30:32 +00:00
Yao Chen
0d7d4d4f30 Modify Loadtest app to be able to exclude certain metric types.
Test: manual
Change-Id: Iba025e4d6cd7c15a231550d382768aa7661ccc86
2017-12-22 09:13:37 -08:00
Bernardo Rufino
79155590e6 Binding on-demand #7: PerformInitializeTask usage
Migrate transport initialization task to binding on-demand. Added
Robolectric tests for the task as well.

Bug: 17140907
Test: m -j RunFrameworksServicesRoboTest
Test: adb shell bmgr init <transport>, observed logs & transport dir
Change-Id: I2d6c1acd31741169080edef2f938fabf43b0649a
2017-12-22 17:06:20 +00:00
Wyatt Riley
8134c9040e Merge "Providing GNSS Model Name & Year" 2017-12-22 17:05:23 +00:00
Narayan Kamath
8182202ac8 Support WorkChains for WakeLock start / stop / change events.
Log WorkChains associated with a given WorkSource to statsd whenever
a wakelock is acquired / released or changes.

Test: WorkSourceTest, manual.
Bug: 62390666

Change-Id: I1720ba8b1778d38067398caac7cf92c4d375f816
2017-12-22 16:21:07 +00:00
Robert Berry
cfc990a49d Implement generateAndStoreKey
For now just returns raw key material. In the future we will need to
change this to use the KeyStore move api. (Once that has been
implemented.)

Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I8aee4da81f0f853503f570dae8d74e1d29f124cc
2017-12-22 15:54:30 +00:00
TreeHugger Robot
5c74af9498 Merge changes I902b2816,I284d421e
* changes:
  Add DISALLOW_AIRPLANE_MODE.
  Add DISALLOW_CONFIG_LOCATION_MODE.
2017-12-22 13:32:15 +00:00
Robert Berry
f0a4bea6b2 Add key encryption to KeySyncTask
This mostly completes the task. Still some TODOs around constructing
the vault metadata correctly, and exactly what the Intent should look
like.

Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ibf5705830f577597f0cc2afdd906f6517e426d01
2017-12-22 13:17:32 +00:00
Robert Berry
bd4c43c686 Update recoverKeys to return raw material
This is a temporary solution, while the KeyStore team works on adding a
move API to KeyStore. (At which point this will be updated to instead
return 'move tokens', allowing the user to move the key from the system's
keystore to their own, without ever seeing the raw material.)

Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I2241a6da15d50c26a7b384d4e5b6f78366fb9300
2017-12-22 11:35:14 +00:00
TreeHugger Robot
edf829f41b Merge "Enforce platform level animation in CrossProfileApps.startMainActivity" 2017-12-22 11:24:28 +00:00
Tony Mak
60f53e67f6 Do not skip broadcast if the parent user is running
What's the problem is:
1. Work profile is not running (work mode is OFF)
2. Uninstall an app
3. ACTION_PACKAGE_REMOVED is sent to work profile
4. AMS skipped the broadcast as the target user of the broadcast is
   not running, but LauncherAppsService is indeed listening to .
5. LauncherAppsService failed to notify Launcher the package change.

Proposed solution:
Not skipping broadcast if its parent user is running. Please also note that
since ag/2325045, BroadcastQueue won't deliever broadcast to
receiver running in stopped users.

Test: Turn off work, remove/ Install any app in work profile, observe
   that Launcher reloads accordingly.
Test: Install an app in work profile, turn off work mode, switch
      to secondary user, adb uninstall that app. Switch back to user 0,
       observe Launcher reloads accordingly.
Test: Reboot the device, didn't see any "Skipping broadcast of" log.

BUG: 70503418

Change-Id: I35a269b09ab83a32a13cc7bc2066c8f71ba9f960
2017-12-22 11:23:08 +00:00
Andrew Scull
8b2af876d3 Merge "DPMS: expose password blacklist API for SDK" 2017-12-22 09:36:52 +00:00
Dmitry Dementyev
ad88471920 Implement API to store and retrieve recovery status.
Currently recovery agents can set/get statuses only for  their own keys.

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

Change-Id: I5cb70ce139ca29c066d46d0bd4d2967bd3c30843
2017-12-21 22:22:44 -08:00
Dmitry Dementyev
3b17c63f69 Implement RecoverableKeyStoreLoader.setSnapshotCreatedPendingIntent
Bug: 66499222
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I45905a2594ae5b4a681f15e78a7f63293c8fb4d5
2017-12-21 20:15:08 -08:00
Zhi An Ng
897719ef13 Merge "Add default alarm back into AudioPackage" 2017-12-22 03:34:17 +00:00
Siyamed Sinir
e864f15ef1 Fix TextViewTest.testFallbackLineSpacing on small devices
Use the same method applied for StaticLayout.testFallbackLineSpacing
and set the text size in pixels.

Test: bit FrameworksCoreTests:android.widget.TextViewTest#testFallbackLineSpacing
Tested on Pixel and Pixel XL

Bug: 68385045
Change-Id: Ib3fd29882551444d4e6e36f820dc547b22c7edbd
2017-12-21 19:24:17 -08:00
TreeHugger Robot
1878f0bd8f Merge "Add settings constants for battery tip" 2017-12-22 02:18:30 +00:00
TreeHugger Robot
34c47f9031 Merge "Switch to WebViewChromiumFactoryProviderForP" 2017-12-22 02:18:08 +00:00
TreeHugger Robot
07eb9db866 Merge "Implement recoverKeys" 2017-12-22 01:49:30 +00:00
Ying Xu
5f51741ae2 Merge "Expose the scan API and network select API." am: 761b7b50d1 am: a9083c3145
am: 3fc3857a73

Change-Id: I90d8d01ecedfa7993852041a7da811899f71cb64
2017-12-22 01:26:53 +00:00
Felipe Leme
c0f8195b3a Moved logContextCommitted() logic to the handler...
...so it does not block showSaveUi.

Bug: 70939974
Test: atest CtsAutoFillServiceTestCases:FieldsClassificationTest

Change-Id: I64bb20c1c617790e7281f287c567cb5c13178a6e
2017-12-21 17:23:24 -08:00
Ying Xu
3fc3857a73 Merge "Expose the scan API and network select API." am: 761b7b50d1
am: a9083c3145

Change-Id: Iee5e44b4f6a9a8921a89c05640be4d52e0251bb8
2017-12-22 01:17:05 +00:00
Ying Xu
a9083c3145 Merge "Expose the scan API and network select API."
am: 761b7b50d1

Change-Id: I6cdbcea874ba58874dcfe47da9866b25643a1a96
2017-12-22 01:09:23 +00:00
TreeHugger Robot
285eb8a804 Merge "Always call start a new fill response when the user manually request autofill." 2017-12-22 01:07:05 +00:00
Ng Zhi An
3b4f22178a Add default alarm back into AudioPackage
Bug: 70788062
Test: open alarm clock and see default alarm
Change-Id: Ic2ca2638015e4bc114461c3b8b0f4fe7dd07c666
2017-12-21 17:02:02 -08:00
Hall Liu
aa9347980e Merge "Add feature flag and EMBMS bug fixes" am: 465f2916e0 am: 3424136a59
am: effcd1f508

Change-Id: Ibefdba1da5da4bfdf93d7db4c0f42a79ad75be46
2017-12-22 01:01:50 +00:00
Ying Xu
761b7b50d1 Merge "Expose the scan API and network select API." 2017-12-22 01:01:09 +00:00
Hall Liu
effcd1f508 Merge "Add feature flag and EMBMS bug fixes" am: 465f2916e0
am: 3424136a59

Change-Id: Iebc092e58752f32b6abfad612901ae094e083449
2017-12-22 00:54:14 +00:00
Hall Liu
3424136a59 Merge "Add feature flag and EMBMS bug fixes"
am: 465f2916e0

Change-Id: I0a590d86b2e39ba77a013ceb2c0d6b6582ef1ae4
2017-12-22 00:48:39 +00:00
Hall Liu
465f2916e0 Merge "Add feature flag and EMBMS bug fixes" 2017-12-22 00:37:31 +00:00
TreeHugger Robot
716a0ac1ee Merge "Camera: pass stream/surface Id instead of Surface" 2017-12-22 00:19:35 +00:00
TreeHugger Robot
b3bc4e7cbb Merge "Fixed a SystemUI crash" 2017-12-22 00:16:46 +00:00
Brad Ebinger
59bc2c6889 Merge "Add new reason code for call barring" am: a003d996b9 am: ddf31e1810
am: 058a752502

Change-Id: I7758c971e63d442a6dd7e72cbec1f440f2aa7055
2017-12-22 00:07:03 +00:00
Robert Berry
b9a220b9b5 Implement recoverKeys
This implements all of recoverKeys, except for loading keys into the
AndroidKeyStore. Also omitting re-enrolling keys into the recoverable
store for now, as it is not clear whether the user will have a lock
screen set at this point. If they do not have a lock screen set, we
cannot re-enroll keys, as the platform-decrypt key is bound to the
lock screen. Also modifies SecureBox to throw AEADBadTagException for
any issues with the encrypted payload. IllegalArgumentException is
a runtime exception, so would be unexpected, but might occur if the
encrypted payload is for some reason garbage. Also, throw NPE if the
payload is null, as that is a programmer error - not something that
should ever occur at runtime.

Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I4f0be412c3044f3472a6aed514f1caf54b7ee41f
2017-12-22 00:05:38 +00:00
Shimi Zhang
295c5a1372 Switch to WebViewChromiumFactoryProviderForP
Bug: 70688155
Test: Flash device to make sure WebView providers are in developer options.
Change-Id: I6fbaa0bd7769da4a83b42a378cb80cf3497294a2
2017-12-21 16:05:16 -08:00
Janis Danisevskis
0aadf935cb Keystore: Use security levels
In anticipation of the availability of Keymaster implementations with
multiple security levels this patch adds the additional
keystore flags FLAG_SOFTWARE and FLAG_STROGBOX.

Also, the IKeystore method addRngEntropy got a new flags parameter
for the caller to express which implementation shall be awarded the
precious entropy.

Test: Keystore CTS tests
Bug: 63931634
Change-Id: I4a4eafbdbe1290f0c7bd2bfa2ce3e5fbb06c2dd8
2017-12-22 00:02:39 +00:00