OSDN Git Service

android-x86/frameworks-base.git
6 years agoPull back app transform and screen rotation transform.
Robert Carr [Wed, 27 Sep 2017 21:57:38 +0000 (14:57 -0700)]
Pull back app transform and screen rotation transform.

App transform is removed in this CL for clarity but being
re-added in Ifc83cbac281ce0654ecd8a1c2ca9c24a4d87c1d1.

Test: go/wm-smoke
Bug: 64674361
Change-Id: Idb7d7409a25cff518540077c9e189eba6d92dc43

6 years agoFix broken generateAndStoreKey tests
Robert Berry [Wed, 27 Dec 2017 10:58:03 +0000 (10:58 +0000)]
Fix broken generateAndStoreKey tests

Sorry, this was my fault. I thought I'd run them but obviously not.

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

6 years agoMerge "Support WorkChains for WakeLock start / stop / change events."
Narayan Kamath [Wed, 27 Dec 2017 08:43:37 +0000 (08:43 +0000)]
Merge "Support WorkChains for WakeLock start / stop / change events."

6 years agoInitialise Notification*Manager dependencies directly.
Eliot Courtney [Thu, 14 Dec 2017 10:57:51 +0000 (19:57 +0900)]
Initialise Notification*Manager dependencies directly.

Currently, adding a new dependency to any of these classes means
updating the constructors of any subclasses, and the construction in the
corresponding SystemUIFactory classes and subclasses. In particular,
updating these in separate vendor/ projects is annoying. So, initialise
the dependencies using field initialisers. The downside is that it's
harder to notice circular Dependencys.

Bug: 63874929
Bug: 62602530
Test: runtest systemui
Test: Compile and run
Change-Id: I21d58d0cc0edeb6d53fb7b387c9baeec7bd80589

6 years agoRemove NotificationPresenter#getEntryManager.
Eliot Courtney [Thu, 14 Dec 2017 10:38:52 +0000 (19:38 +0900)]
Remove NotificationPresenter#getEntryManager.

Instead, pass it along with calls to setUpWithPresenter.

Bug: 63874929
Bug: 62602530
Test: runtest systemui
Test: Compile and run
Change-Id: Icd60cf671b12b33d4565cc608c6141cd580c790e

6 years agoChange all mocks that are Dependencys to be properly injected.
Eliot Courtney [Thu, 14 Dec 2017 09:54:28 +0000 (18:54 +0900)]
Change all mocks that are Dependencys to be properly injected.

If a class being unit tested is changed to Dependency.get() a dependency
rather than receiving it as an argument, the tests could break in subtle
ways. Make sure all mocked Dependencys are properly injected as test
dependencies.

Bug: 63874929
Bug: 62602530
Test: runtest systemui
Change-Id: I2b23a2ea0ac9067952624a5c302ca419685307ae

6 years agoSplit NotificationViewHierarchyManager out of StatusBar.
Eliot Courtney [Mon, 27 Nov 2017 04:27:46 +0000 (13:27 +0900)]
Split NotificationViewHierarchyManager out of StatusBar.

NotificationViewHierarchyManager handles bundling and unbundling of
notifications. In doing so, which notifications are parents/children of
the other can change. NotificationViewHierarchyManager makes sure the
view hierarchy of the notifications matches their grouping.

Bug: 63874929
Bug: 62602530
Test: runtest systemui
Test: Compile and run
Change-Id: Ia1c8ed75d4eb8df52897c5d6aa0713f8335b2a19

6 years agoSplit NotificationEntryManager out of StatusBar.
Eliot Courtney [Fri, 20 Oct 2017 04:26:58 +0000 (13:26 +0900)]
Split NotificationEntryManager out of StatusBar.

NotificationEntryManager is responsible for the adding, removing, and
updating of notifications among other things, such as their inflation
and their interaction with other Notification*Manager objects.

Bug: 63874929
Bug: 62602530
Test: runtest systemui
Test: Compile and run
Change-Id: I56f8c524875900112cdf9f6120407b61e201172f

6 years agoMerge "Document which sys services can be accessed by instant apps"
TreeHugger Robot [Tue, 26 Dec 2017 04:13:15 +0000 (04:13 +0000)]
Merge "Document which sys services can be accessed by instant apps"

6 years agoMerge "Don't record audio if UID is idle - core framework"
TreeHugger Robot [Tue, 26 Dec 2017 03:39:42 +0000 (03:39 +0000)]
Merge "Don't record audio if UID is idle - core framework"

6 years agoMerge "Expose removeAt(int) for parity with other sparse collections."
Jake Wharton [Sun, 24 Dec 2017 05:32:13 +0000 (05:32 +0000)]
Merge "Expose removeAt(int) for parity with other sparse collections."

6 years agoDocument which sys services can be accessed by instant apps
Svet Ganov [Sat, 23 Dec 2017 07:29:24 +0000 (23:29 -0800)]
Document which sys services can be accessed by instant apps

This change documents that some system services are not available
to instant apps due to the restricted security sandbox they run in.
Also ensure that if target SDK is P WallpaperManager is null if the
backing system service cannot be looked up to be consistent with
the way other system services behave.

Test: Manual

Fixes: 70984822
Fixes: 69848394

Change-Id: I9aae884d5840c92136c7d713fac87e7732dc2642

6 years agoWrite the integer given by setServerParameters() into SQLite DB
Bo Zhu [Sat, 23 Dec 2017 00:05:15 +0000 (16:05 -0800)]
Write the integer given by setServerParameters() into SQLite DB

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

6 years agoMerge "Add usagestats dump in case of test failure."
TreeHugger Robot [Sat, 23 Dec 2017 04:09:33 +0000 (04:09 +0000)]
Merge "Add usagestats dump in case of test failure."

6 years agoAdd infrastructure for running a11y tests in instant mode
Svet Ganov [Fri, 22 Dec 2017 17:43:48 +0000 (09:43 -0800)]
Add infrastructure for running a11y tests in instant mode

This change adds a special flag when binding to a service to request
instant apps to be considered as well (assuming the caller has the
permission to see instant apps). This flag is scoped only for the
platform to use and is intended only for development and testing.
Specifically, we have a class of CTS tests that has tests plus service
in the same APK (accessibility, printing, autofill, any other plugin
based sub-system).

Instead of doing the tediuous work split all these into one APK with
tests and one with the services where the latter exposes a remote
interface to the former, we will be adding shell commands to the
dedicated sub-system to allow temporary binding to plugins provided
by instant apps. The goal is not validating the plugin behavious,
rather a working plugin is required to test app side funcionality.

This change adds a shell command to allow the a11y manager serivce
to bind to plugins provided by instant apps. This is required to
be able to run relevant CTS test cases in instant mode.

Test: cts-tradefed run cts-dev -m CtsAccessibilityTestCases
      cts-tradefed run cts-dev -m CtsAccessibilityServiceTestCases

Bug: 70978575

Change-Id: Ifced735a9a6e495747372dd8b00fdd64933a09c7

6 years agoAdd usagestats dump in case of test failure.
Sudheer Shanka [Sat, 23 Dec 2017 02:06:37 +0000 (18:06 -0800)]
Add usagestats dump in case of test failure.

And Increase the wait after turning on the screen so that
the state gets propagated through the system.

Test: atest services/tests/servicestests/src/com/android/server/net/ConnOnActivityStartTest.java
Change-Id: Ie2737cdc7959147f096e10739c1cf78fad669464

6 years agoMerge "Moved logContextCommitted() logic to the handler..."
TreeHugger Robot [Sat, 23 Dec 2017 01:22:35 +0000 (01:22 +0000)]
Merge "Moved  logContextCommitted() logic to the handler..."

6 years agoMerge "Add MetricsEvent ENUMS for "Mobile network" preferences." am: e4e5291743 am...
Malcolm Chen [Sat, 23 Dec 2017 01:08:06 +0000 (01:08 +0000)]
Merge "Add MetricsEvent ENUMS for "Mobile network" preferences." am: e4e5291743 am: 675839f0fa
am: e406983505  -s ours

Change-Id: I7908bfec8747c8298e37ba4139446c35d0be8794

6 years agoMerge "Add MetricsEvent ENUMS for "Mobile network" preferences." am: e4e5291743
Malcolm Chen [Sat, 23 Dec 2017 00:59:00 +0000 (00:59 +0000)]
Merge "Add MetricsEvent ENUMS for "Mobile network" preferences." am: e4e5291743
am: 675839f0fa

Change-Id: Ie4f70a3e95fe96d9b82488affa226d724a4e4278

6 years agoMerge "Add MetricsEvent ENUMS for "Mobile network" preferences."
Malcolm Chen [Sat, 23 Dec 2017 00:50:25 +0000 (00:50 +0000)]
Merge "Add MetricsEvent ENUMS for "Mobile network" preferences."
am: e4e5291743

Change-Id: I504256eb76a94002678832ecb13a6ef12f7d3603

6 years agoMerge "Add MetricsEvent ENUMS for "Mobile network" preferences."
Treehugger Robot [Sat, 23 Dec 2017 00:41:49 +0000 (00:41 +0000)]
Merge "Add MetricsEvent ENUMS for "Mobile network" preferences."

6 years agoAdd MetricsEvent ENUMS for "Mobile network" preferences.
Malcolm Chen [Tue, 25 Jul 2017 22:48:44 +0000 (15:48 -0700)]
Add MetricsEvent ENUMS for "Mobile network" preferences.

Bug: 34775714
Test: Manual
Change-Id: I71645de4f07d10c6c3772a6fef119dbdec2db8ef
Merged-In: I71645de4f07d10c6c3772a6fef119dbdec2db8ef

6 years agoMerge "Updating Batterystats version to 29."
TreeHugger Robot [Fri, 22 Dec 2017 23:17:53 +0000 (23:17 +0000)]
Merge "Updating Batterystats version to 29."

6 years agoMerge "Add key encryption to KeySyncTask"
TreeHugger Robot [Fri, 22 Dec 2017 22:38:10 +0000 (22:38 +0000)]
Merge "Add key encryption to KeySyncTask"

6 years agoMerge "Read paired device After LocalBtManager is created"
Lei Yu [Fri, 22 Dec 2017 22:17:28 +0000 (22:17 +0000)]
Merge "Read paired device After LocalBtManager is created"

6 years agoMerge "Add feature flag for security settings v2."
TreeHugger Robot [Fri, 22 Dec 2017 21:49:35 +0000 (21:49 +0000)]
Merge "Add feature flag for security settings v2."

6 years agoUpdating Batterystats version to 29.
Kweku Adams [Fri, 22 Dec 2017 21:21:06 +0000 (13:21 -0800)]
Updating Batterystats version to 29.

Bug: 70808931
Bug: 63813658
Bug: 62549765
Test: build Android
Change-Id: Ifc3e41d5189e9c21aaad82b13cf7ce7fbf39ade8

6 years agoMerge changes I2266bfec,Id2d6cb6d,Ib18e7783
TreeHugger Robot [Fri, 22 Dec 2017 21:12:49 +0000 (21:12 +0000)]
Merge changes I2266bfec,Id2d6cb6d,Ib18e7783

* changes:
  Change ContextHubTransaction Callback to Listener
  Adds a createClient method with no Executor argument
  Replace Handler with Executor in new APIs

6 years agoMerge "Implement the DB table to store the recovery service's public key"
TreeHugger Robot [Fri, 22 Dec 2017 21:12:27 +0000 (21:12 +0000)]
Merge "Implement the DB table to store the recovery service's public key"

6 years agoMerge "JankBench: make it build and run in Android build"
Joel Fernandes [Fri, 22 Dec 2017 20:23:48 +0000 (20:23 +0000)]
Merge "JankBench: make it build and run in Android build"

6 years agoJankBench: make it build and run in Android build
Joel Fernandes [Thu, 26 Oct 2017 19:24:30 +0000 (12:24 -0700)]
JankBench: make it build and run in Android build

JankBench is a tool heavily used for scheduler and graphics testing.
JankBench has been an android studio project and traditionally its APK
has been built outside of the Android tree using studio. This patch
makes it possible to build it using Android source tree without needing
studio.

Some library imports needed renaming and an xml file had a typo, also
resource IDs need to be 16-bits so I fixed that up. List fragments can't
be anonymous instantiations anymore so changed it to be non-anonymous.

Bug: 31544438
Test: Run all Jankbench benchmarks manually in the app.
Change-Id: Ib5e4351fcc72acdec20424ae30598c205e7803f7
Signed-off-by: Joel Fernandes <joelaf@google.com>
6 years agoMerge "Fix object pool for lifecycler"
Andrii Kulian [Fri, 22 Dec 2017 19:48:35 +0000 (19:48 +0000)]
Merge "Fix object pool for lifecycler"

6 years agoImplement the DB table to store the recovery service's public key
Bo Zhu [Thu, 21 Dec 2017 22:36:11 +0000 (14:36 -0800)]
Implement the DB table to store the recovery service's public key

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

6 years agoMerge "Fixed RTL alignment issue in suggested language list"
TreeHugger Robot [Fri, 22 Dec 2017 19:22:08 +0000 (19:22 +0000)]
Merge "Fixed RTL alignment issue in suggested language list"

6 years agoMerge "Camera: Add support for session parameters"
TreeHugger Robot [Fri, 22 Dec 2017 19:18:49 +0000 (19:18 +0000)]
Merge "Camera: Add support for session parameters"

6 years agoMerge "Implement generateAndStoreKey"
TreeHugger Robot [Fri, 22 Dec 2017 19:10:24 +0000 (19:10 +0000)]
Merge "Implement generateAndStoreKey"

6 years agoMerge "Modify Loadtest app to be able to exclude certain metric types."
TreeHugger Robot [Fri, 22 Dec 2017 18:44:21 +0000 (18:44 +0000)]
Merge "Modify Loadtest app to be able to exclude certain metric types."

6 years agoMerge "Update recoverKeys to return raw material"
TreeHugger Robot [Fri, 22 Dec 2017 18:40:28 +0000 (18:40 +0000)]
Merge "Update recoverKeys to return raw material"

6 years agoRead paired device After LocalBtManager is created
jackqdyulei [Fri, 22 Dec 2017 17:50:28 +0000 (09:50 -0800)]
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

6 years agoMerge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3a8be1ae39 ...
Android Build Merger (Role) [Fri, 22 Dec 2017 18:17:42 +0000 (18:17 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3a8be1ae39  -s ours am: cb562a40d9  -s ours am: 323dc6b0d0  -s ours"

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3a8be1ae39 -s ours...
Bill Yi [Fri, 22 Dec 2017 18:17:21 +0000 (18:17 +0000)]
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

6 years agoMerge "Fix TextViewTest.testFallbackLineSpacing on small devices"
Siyamed Sinir [Fri, 22 Dec 2017 18:16:54 +0000 (18:16 +0000)]
Merge "Fix TextViewTest.testFallbackLineSpacing on small devices"

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3a8be1ae39 -s ours
Bill Yi [Fri, 22 Dec 2017 18:11:27 +0000 (18:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3a8be1ae39  -s ours
am: cb562a40d9  -s ours

Change-Id: Iba2031a23c32e6ad748339ae7e2107bea8f80eb2

6 years agoAdd feature flag for security settings v2.
Fan Zhang [Fri, 22 Dec 2017 18:03:00 +0000 (10:03 -0800)]
Add feature flag for security settings v2.

Bug:  32953042
Test: rebuild
Change-Id: Iabfd4705f01cf8a1ca1a3374de3d5a31850ae681

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Fri, 22 Dec 2017 18:02:46 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 3a8be1ae39  -s ours

Change-Id: I2bfbaa9cc6b920112bc71a0b76b1382eb9d68e95

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Fri, 22 Dec 2017 17:57:02 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoFixed RTL alignment issue in suggested language list
susanta.patra [Fri, 8 Dec 2017 04:53:13 +0000 (10:23 +0530)]
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>
6 years agoMerge "Do not skip broadcast if the parent user is running"
TreeHugger Robot [Fri, 22 Dec 2017 17:30:32 +0000 (17:30 +0000)]
Merge "Do not skip broadcast if the parent user is running"

6 years agoModify Loadtest app to be able to exclude certain metric types.
Yao Chen [Thu, 21 Dec 2017 21:00:59 +0000 (13:00 -0800)]
Modify Loadtest app to be able to exclude certain metric types.

Test: manual
Change-Id: Iba025e4d6cd7c15a231550d382768aa7661ccc86

6 years agoMerge "Providing GNSS Model Name & Year"
Wyatt Riley [Fri, 22 Dec 2017 17:05:23 +0000 (17:05 +0000)]
Merge "Providing GNSS Model Name & Year"

6 years agoSupport WorkChains for WakeLock start / stop / change events.
Narayan Kamath [Fri, 8 Dec 2017 11:56:01 +0000 (11:56 +0000)]
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

6 years agoImplement generateAndStoreKey
Robert Berry [Fri, 22 Dec 2017 15:54:30 +0000 (15:54 +0000)]
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

6 years agoMerge changes I902b2816,I284d421e
TreeHugger Robot [Fri, 22 Dec 2017 13:32:15 +0000 (13:32 +0000)]
Merge changes I902b2816,I284d421e

* changes:
  Add DISALLOW_AIRPLANE_MODE.
  Add DISALLOW_CONFIG_LOCATION_MODE.

6 years agoAdd key encryption to KeySyncTask
Robert Berry [Fri, 22 Dec 2017 13:17:32 +0000 (13:17 +0000)]
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

6 years agoUpdate recoverKeys to return raw material
Robert Berry [Fri, 22 Dec 2017 11:35:14 +0000 (11:35 +0000)]
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

6 years agoMerge "Enforce platform level animation in CrossProfileApps.startMainActivity"
TreeHugger Robot [Fri, 22 Dec 2017 11:24:28 +0000 (11:24 +0000)]
Merge "Enforce platform level animation in CrossProfileApps.startMainActivity"

6 years agoDo not skip broadcast if the parent user is running
Tony Mak [Thu, 21 Dec 2017 20:03:29 +0000 (20:03 +0000)]
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

6 years agoMerge "DPMS: expose password blacklist API for SDK"
Andrew Scull [Fri, 22 Dec 2017 09:36:52 +0000 (09:36 +0000)]
Merge "DPMS: expose password blacklist API for SDK"

6 years agoImplement API to store and retrieve recovery status.
Dmitry Dementyev [Wed, 20 Dec 2017 20:38:36 +0000 (12:38 -0800)]
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

6 years agoImplement RecoverableKeyStoreLoader.setSnapshotCreatedPendingIntent
Dmitry Dementyev [Fri, 22 Dec 2017 01:30:48 +0000 (17:30 -0800)]
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

6 years agoMerge "Add default alarm back into AudioPackage"
Zhi An Ng [Fri, 22 Dec 2017 03:34:17 +0000 (03:34 +0000)]
Merge "Add default alarm back into AudioPackage"

6 years agoFix TextViewTest.testFallbackLineSpacing on small devices
Siyamed Sinir [Fri, 22 Dec 2017 03:24:17 +0000 (19:24 -0800)]
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

6 years agoMerge "Add settings constants for battery tip"
TreeHugger Robot [Fri, 22 Dec 2017 02:18:30 +0000 (02:18 +0000)]
Merge "Add settings constants for battery tip"

6 years agoMerge "Switch to WebViewChromiumFactoryProviderForP"
TreeHugger Robot [Fri, 22 Dec 2017 02:18:08 +0000 (02:18 +0000)]
Merge "Switch to WebViewChromiumFactoryProviderForP"

6 years agoMerge "Implement recoverKeys"
TreeHugger Robot [Fri, 22 Dec 2017 01:49:30 +0000 (01:49 +0000)]
Merge "Implement recoverKeys"

6 years agoMerge "Expose the scan API and network select API." am: 761b7b50d1 am: a9083c3145
Ying Xu [Fri, 22 Dec 2017 01:26:53 +0000 (01:26 +0000)]
Merge "Expose the scan API and network select API." am: 761b7b50d1 am: a9083c3145
am: 3fc3857a73

Change-Id: I90d8d01ecedfa7993852041a7da811899f71cb64

6 years agoMoved logContextCommitted() logic to the handler...
Felipe Leme [Fri, 22 Dec 2017 01:01:25 +0000 (17:01 -0800)]
Moved  logContextCommitted() logic to the handler...

...so it does not block showSaveUi.

Bug: 70939974
Test: atest CtsAutoFillServiceTestCases:FieldsClassificationTest

Change-Id: I64bb20c1c617790e7281f287c567cb5c13178a6e

6 years agoMerge "Expose the scan API and network select API." am: 761b7b50d1
Ying Xu [Fri, 22 Dec 2017 01:17:05 +0000 (01:17 +0000)]
Merge "Expose the scan API and network select API." am: 761b7b50d1
am: a9083c3145

Change-Id: Iee5e44b4f6a9a8921a89c05640be4d52e0251bb8

6 years agoMerge "Expose the scan API and network select API."
Ying Xu [Fri, 22 Dec 2017 01:09:23 +0000 (01:09 +0000)]
Merge "Expose the scan API and network select API."
am: 761b7b50d1

Change-Id: I6cdbcea874ba58874dcfe47da9866b25643a1a96

6 years agoMerge "Always call start a new fill response when the user manually request autofill."
TreeHugger Robot [Fri, 22 Dec 2017 01:07:05 +0000 (01:07 +0000)]
Merge "Always call start a new fill response when the user manually request autofill."

6 years agoAdd default alarm back into AudioPackage
Ng Zhi An [Fri, 22 Dec 2017 01:02:02 +0000 (17:02 -0800)]
Add default alarm back into AudioPackage

Bug: 70788062
Test: open alarm clock and see default alarm
Change-Id: Ic2ca2638015e4bc114461c3b8b0f4fe7dd07c666

6 years agoMerge "Add feature flag and EMBMS bug fixes" am: 465f2916e0 am: 3424136a59
Hall Liu [Fri, 22 Dec 2017 01:01:50 +0000 (01:01 +0000)]
Merge "Add feature flag and EMBMS bug fixes" am: 465f2916e0 am: 3424136a59
am: effcd1f508

Change-Id: Ibefdba1da5da4bfdf93d7db4c0f42a79ad75be46

6 years agoMerge "Expose the scan API and network select API."
Ying Xu [Fri, 22 Dec 2017 01:01:09 +0000 (01:01 +0000)]
Merge "Expose the scan API and network select API."

6 years agoMerge "Add feature flag and EMBMS bug fixes" am: 465f2916e0
Hall Liu [Fri, 22 Dec 2017 00:54:14 +0000 (00:54 +0000)]
Merge "Add feature flag and EMBMS bug fixes" am: 465f2916e0
am: 3424136a59

Change-Id: Iebc092e58752f32b6abfad612901ae094e083449

6 years agoMerge "Add feature flag and EMBMS bug fixes"
Hall Liu [Fri, 22 Dec 2017 00:48:39 +0000 (00:48 +0000)]
Merge "Add feature flag and EMBMS bug fixes"
am: 465f2916e0

Change-Id: I0a590d86b2e39ba77a013ceb2c0d6b6582ef1ae4

6 years agoMerge "Add feature flag and EMBMS bug fixes"
Hall Liu [Fri, 22 Dec 2017 00:37:31 +0000 (00:37 +0000)]
Merge "Add feature flag and EMBMS bug fixes"

6 years agoMerge "Camera: pass stream/surface Id instead of Surface"
TreeHugger Robot [Fri, 22 Dec 2017 00:19:35 +0000 (00:19 +0000)]
Merge "Camera: pass stream/surface Id instead of Surface"

6 years agoMerge "Fixed a SystemUI crash"
TreeHugger Robot [Fri, 22 Dec 2017 00:16:46 +0000 (00:16 +0000)]
Merge "Fixed a SystemUI crash"

6 years agoMerge "Add new reason code for call barring" am: a003d996b9 am: ddf31e1810
Brad Ebinger [Fri, 22 Dec 2017 00:07:03 +0000 (00:07 +0000)]
Merge "Add new reason code for call barring" am: a003d996b9 am: ddf31e1810
am: 058a752502

Change-Id: I7758c971e63d442a6dd7e72cbec1f440f2aa7055

6 years agoImplement recoverKeys
Robert Berry [Thu, 21 Dec 2017 12:41:01 +0000 (12:41 +0000)]
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

6 years agoSwitch to WebViewChromiumFactoryProviderForP
Shimi Zhang [Fri, 15 Dec 2017 03:03:30 +0000 (19:03 -0800)]
Switch to WebViewChromiumFactoryProviderForP

Bug: 70688155
Test: Flash device to make sure WebView providers are in developer options.
Change-Id: I6fbaa0bd7769da4a83b42a378cb80cf3497294a2

6 years agoAdd settings constants for battery tip
jackqdyulei [Wed, 13 Dec 2017 23:01:43 +0000 (15:01 -0800)]
Add settings constants for battery tip

Bug: 70570352
Test: Build
Change-Id: I6639916b5b685d3ee64cfc2ea0771c1244e0e437

6 years agoMerge "Add new reason code for call barring" am: a003d996b9
Brad Ebinger [Thu, 21 Dec 2017 23:59:45 +0000 (23:59 +0000)]
Merge "Add new reason code for call barring" am: a003d996b9
am: ddf31e1810

Change-Id: Ieb37e63f6843c21a40e366b08d8cf40b2f6d69d8

6 years agoMerge "Add new reason code for call barring"
Brad Ebinger [Thu, 21 Dec 2017 23:53:13 +0000 (23:53 +0000)]
Merge "Add new reason code for call barring"
am: a003d996b9

Change-Id: I36fd5803e1a1a535a000dc4e69dc7238fa26efbd

6 years agoMerge "Add KeySyncTask"
Robert Berry [Thu, 21 Dec 2017 23:45:36 +0000 (23:45 +0000)]
Merge "Add KeySyncTask"

6 years agoMerge "Add new reason code for call barring"
Brad Ebinger [Thu, 21 Dec 2017 23:45:01 +0000 (23:45 +0000)]
Merge "Add new reason code for call barring"

6 years agoMerge "Make TelephonyManager#{set/get}{Voice/Date}ActivationState SystemApis"
Gil O'Neil [Thu, 21 Dec 2017 23:36:20 +0000 (23:36 +0000)]
Merge "Make TelephonyManager#{set/get}{Voice/Date}ActivationState SystemApis"

6 years agoFix object pool for lifecycler
Andrii Kulian [Wed, 20 Dec 2017 23:38:12 +0000 (15:38 -0800)]
Fix object pool for lifecycler

The original implementation of object pool for lifecycle
transactions tried to always recycle objects after a
transaction was scheduled. In case when a client was running
in the same process this lead to objects being emptied before
it could actually perform the transaction.
Also when checking if object was already in the pool we should
use "==" instead of equality check.

Bug: 70568084
Bug: 70526039
Bug: 70616950
Test: android.app.servertransaction.ObjectPoolTests
Change-Id: I45eeecc189b9a458d8efdfed256b81cf0baf8b95

6 years agoExpose removeAt(int) for parity with other sparse collections.
Jake Wharton [Thu, 21 Dec 2017 21:59:54 +0000 (16:59 -0500)]
Expose removeAt(int) for parity with other sparse collections.

Bug: 70934959
Test: none
Change-Id: Ic26a9fba610d6361247e0485803b52569fbf4a38

6 years agoMerge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions"
TreeHugger Robot [Thu, 21 Dec 2017 23:22:34 +0000 (23:22 +0000)]
Merge "Require that caller holds  SEND_SMS and  MODIFY_PHONES_STATE permissions"

6 years agoMerge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev am: acc55...
Andrew Solovay [Thu, 21 Dec 2017 23:02:51 +0000 (23:02 +0000)]
Merge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev am: acc55e61dd
am: 4adbc6b5b0  -s ours

Change-Id: I7dcbba1052771fbfe6ef74c10b52a41941db1895

6 years agoMerge "AudioManager: add method to query stream attenuations in dB"
Jean-Michel Trivi [Thu, 21 Dec 2017 22:58:53 +0000 (22:58 +0000)]
Merge "AudioManager: add method to query stream attenuations in dB"

6 years agoMerge "Add feature flag for RTT in call log" am: 138d07f82d am: 9a5e663d97
Hall Liu [Thu, 21 Dec 2017 22:56:27 +0000 (22:56 +0000)]
Merge "Add feature flag for RTT in call log" am: 138d07f82d am: 9a5e663d97
am: 51c68e6570

Change-Id: I44de419a5b170d6fd5b1d26f4291eb3750b11c59

6 years agoMerge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev
Andrew Solovay [Thu, 21 Dec 2017 22:55:33 +0000 (22:55 +0000)]
Merge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev
am: acc55e61dd

Change-Id: I35d0f71a7da2dcae3ed3bab4aa111290ea4c4c60

6 years agoMerge "Add feature flag for RTT in call log" am: 138d07f82d
Hall Liu [Thu, 21 Dec 2017 22:47:29 +0000 (22:47 +0000)]
Merge "Add feature flag for RTT in call log" am: 138d07f82d
am: 9a5e663d97

Change-Id: Ibdf102659e079844e81faac327b0d9cfb3b0d9de

6 years agoAlways call start a new fill response when the user manually request autofill.
Felipe Leme [Thu, 21 Dec 2017 22:43:19 +0000 (14:43 -0800)]
Always call start a new fill response when the user manually request autofill.

Test: atest CtsAutoFillServiceTestCases:LoginActivityTest#testAutofillManuallyAlwaysCallServiceAgain
Test: atest CtsAutoFillServiceTestCases

Fixes: 69318180

Change-Id: I67f63f57f249bb109ca764bd2d0911ad6f5c4065

6 years agoMerge "Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" am...
Android Build Merger (Role) [Thu, 21 Dec 2017 22:43:36 +0000 (22:43 +0000)]
Merge "Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" am: 045fdae1b3 am: d6c2722094 am: f3caa4dc5a  -s ours"

6 years agoMerge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" am: 045fdae1b3...
Hansong Zhang [Thu, 21 Dec 2017 22:41:34 +0000 (22:41 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" am: 045fdae1b3 am: d6c2722094
am: f3caa4dc5a  -s ours

Change-Id: I0e57ed1b1d48339ce841eb9bd193ded71e48e053

6 years agoMerge "Modify system properties proto"
TreeHugger Robot [Thu, 21 Dec 2017 22:41:33 +0000 (22:41 +0000)]
Merge "Modify system properties proto"

6 years agoMerge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev
TreeHugger Robot [Thu, 21 Dec 2017 22:41:15 +0000 (22:41 +0000)]
Merge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev