OSDN Git Service

android-x86/frameworks-base.git
6 years agoAdd more IntDef prefixes for auto-documenting.
Jeff Sharkey [Thu, 14 Dec 2017 03:05:05 +0000 (20:05 -0700)]
Add more IntDef prefixes for auto-documenting.

Test: builds, boots
Bug: 70177949
Exempt-From-Owner-Approval: annotation-only changes
Change-Id: I76dde6054e06f52240bd4b1a0f196dcb74623608

6 years agoMerge "Check wifi feature before starting wifi service"
Bo Hu [Wed, 13 Dec 2017 16:56:12 +0000 (16:56 +0000)]
Merge "Check wifi feature before starting wifi service"

6 years agoMerge "API that reports first SDK level of the device."
Jeff Sharkey [Wed, 13 Dec 2017 16:53:55 +0000 (16:53 +0000)]
Merge "API that reports first SDK level of the device."

6 years agoMerge "Add Notification Flag behavior test"
TreeHugger Robot [Wed, 13 Dec 2017 16:31:45 +0000 (16:31 +0000)]
Merge "Add Notification Flag behavior test"

6 years agoMerge "Remove some duplication."
TreeHugger Robot [Wed, 13 Dec 2017 16:22:50 +0000 (16:22 +0000)]
Merge "Remove some duplication."

6 years agoMerge "Avoid potential failure to boot with bad storage"
Neil Fuller [Wed, 13 Dec 2017 15:56:56 +0000 (15:56 +0000)]
Merge "Avoid potential failure to boot with bad storage"

6 years agoMerge "Split internal common utils library to 1.x and 2.x."
Tomasz Wasilczyk [Wed, 13 Dec 2017 15:21:11 +0000 (15:21 +0000)]
Merge "Split internal common utils library to 1.x and 2.x."

6 years agoMerge "Remove unnecessary filtering of android.test.mock files"
Paul Duffin [Wed, 13 Dec 2017 13:42:50 +0000 (13:42 +0000)]
Merge "Remove unnecessary filtering of android.test.mock files"

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 13 Dec 2017 12:43:40 +0000 (12:43 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 13 Dec 2017 12:37:57 +0000 (12:37 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 13 Dec 2017 12:29:36 +0000 (12:29 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Allow profile owners to call removeAccount"
TreeHugger Robot [Wed, 13 Dec 2017 11:46:10 +0000 (11:46 +0000)]
Merge "Allow profile owners to call removeAccount"

6 years agoMerge "Stop dynamically depending on legacy-android-test"
Paul Duffin [Wed, 13 Dec 2017 11:38:20 +0000 (11:38 +0000)]
Merge "Stop dynamically depending on legacy-android-test"

6 years agoMerge "Move recoverablekeystore package under services"
Robert Berry [Wed, 13 Dec 2017 11:32:42 +0000 (11:32 +0000)]
Merge "Move recoverablekeystore package under services"

6 years agoMerge "Fix trySetQuietModeDisabled may introduce deadlock"
Tony Mak [Wed, 13 Dec 2017 10:51:05 +0000 (10:51 +0000)]
Merge "Fix trySetQuietModeDisabled may introduce deadlock"

6 years agoMerge changes from topic "deprecated_sdk_1"
Przemyslaw Szczepaniak [Wed, 13 Dec 2017 10:15:46 +0000 (10:15 +0000)]
Merge changes from topic "deprecated_sdk_1"

* changes:
  Reject apks targeting deprecated sdk
  Add Build.Version.MIN_SUPPORTED_TARGET_SDK_INT field.

6 years agoMerge "Added test cases for DataCallResponse parcel read/write" am: 125d736bbe am...
Jack Yu [Wed, 13 Dec 2017 10:00:39 +0000 (10:00 +0000)]
Merge "Added test cases for DataCallResponse parcel read/write" am: 125d736bbe am: 06bf4f618c
am: 8b325a0654  -s ours

Change-Id: Ib10df4c1d18c72dccdca4a202dcf2b07caf7a1d5

6 years agoMerge "Added test cases for DataCallResponse parcel read/write" am: 125d736bbe
Jack Yu [Wed, 13 Dec 2017 09:51:27 +0000 (09:51 +0000)]
Merge "Added test cases for DataCallResponse parcel read/write" am: 125d736bbe
am: 06bf4f618c

Change-Id: I0fb9abd42aa9b995c76969a12b52eb6795acafb2

6 years agoMerge "Let prepareDrag return error when 0 size drag shadow is specified."
TreeHugger Robot [Wed, 13 Dec 2017 09:44:36 +0000 (09:44 +0000)]
Merge "Let prepareDrag return error when 0 size drag shadow is specified."

6 years agoMerge "Added test cases for DataCallResponse parcel read/write"
Jack Yu [Wed, 13 Dec 2017 09:42:49 +0000 (09:42 +0000)]
Merge "Added test cases for DataCallResponse parcel read/write"
am: 125d736bbe

Change-Id: I9b2bd725ddaa40513747e368553c918899987d2f

6 years agoMerge "Added test cases for DataCallResponse parcel read/write"
Treehugger Robot [Wed, 13 Dec 2017 09:29:25 +0000 (09:29 +0000)]
Merge "Added test cases for DataCallResponse parcel read/write"

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 13 Dec 2017 08:36:14 +0000 (00:36 -0800)]
Import translations. DO NOT MERGE

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

6 years agoAdded test cases for DataCallResponse parcel read/write
Jack Yu [Thu, 7 Dec 2017 23:49:09 +0000 (15:49 -0800)]
Added test cases for DataCallResponse parcel read/write

bug: 64132030
Test: Unit tests
Merged-In: I87a9af987dd7366bfe6b22252e2c4bdc0fbdd727
Change-Id: I87a9af987dd7366bfe6b22252e2c4bdc0fbdd727
(cherry picked from commit 14c2aaa0a276807bdf922a3e7ce64bae880e0c68)

6 years agoRemove unnecessary filtering of android.test.mock files
Paul Duffin [Tue, 12 Dec 2017 16:13:28 +0000 (16:13 +0000)]
Remove unnecessary filtering of android.test.mock files

Previously the android.test.mock files were in the test-runner/src
directory so had to be filtered out of the android.test.runner source
files but the android.test.mock files are now in their own test-mock/src
directory so the filtering is no longer required.

Bug: 30188076
Test: make checkbuild
Change-Id: I1f28fc0735e16fa166663e5797af641b08a4926c

6 years agoStop dynamically depending on legacy-android-test
Paul Duffin [Mon, 11 Dec 2017 21:12:06 +0000 (21:12 +0000)]
Stop dynamically depending on legacy-android-test

The legacy-android-test target is deprecated.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* services/tests/shortcutmanagerutils/Android.mk
    Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because
    legacy-android-test is deprecated and ShortcutManagerTestUtils
    source does not depend on it or its classes.

Bug: 30188076
Test: make checkbuild
Change-Id: I1136dde4beb556b839c2c1adf4f1c2264c0cbf5b

6 years agoCheck wifi feature before starting wifi service
bohu [Mon, 11 Dec 2017 19:54:40 +0000 (11:54 -0800)]
Check wifi feature before starting wifi service

Otherwise, Wifi service could crash SystemServer;
for example, on emulator system image where wifi
feature is missing, starting wifi will cause boot
failure.

BUG: 70378659

Change-Id: I82546c2c63fb6736e8216a7942fba2d3c9affb13

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 13 Dec 2017 06:59:43 +0000 (22:59 -0800)]
Import translations. DO NOT MERGE

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

6 years agoMerge "Add config resource specifying WallpaperManagerService"
TreeHugger Robot [Wed, 13 Dec 2017 06:59:37 +0000 (06:59 +0000)]
Merge "Add config resource specifying WallpaperManagerService"

6 years agoMerge "Close mDragState immediately when error"
TreeHugger Robot [Wed, 13 Dec 2017 05:58:04 +0000 (05:58 +0000)]
Merge "Close mDragState immediately when error"

6 years agoMerge "AAPT2: Remove signatures from multi-APK artifacts."
TreeHugger Robot [Wed, 13 Dec 2017 05:32:41 +0000 (05:32 +0000)]
Merge "AAPT2: Remove signatures from multi-APK artifacts."

6 years agoMerge "renderthread: relax error handling for wide gamut EGL configs"
TreeHugger Robot [Wed, 13 Dec 2017 04:49:10 +0000 (04:49 +0000)]
Merge "renderthread: relax error handling for wide gamut EGL configs"

6 years agoMerge "Allow multiple standby buckets to be set in one IPC"
TreeHugger Robot [Wed, 13 Dec 2017 04:33:39 +0000 (04:33 +0000)]
Merge "Allow multiple standby buckets to be set in one IPC"

6 years agoMerge "Add pre/post callback to IDragDropCallback"
TreeHugger Robot [Wed, 13 Dec 2017 04:15:53 +0000 (04:15 +0000)]
Merge "Add pre/post callback to IDragDropCallback"

6 years agoLet prepareDrag return error when 0 size drag shadow is specified.
Daichi Hirono [Tue, 12 Dec 2017 08:54:12 +0000 (17:54 +0900)]
Let prepareDrag return error when 0 size drag shadow is specified.

Since ag/2837472, creating 0 size surface resulted in raising an
exception. To avoid it, the CL lets prepareDrag return error.

Bug: 70393408
Test: com.android.server.wm.DragDropControllerTests,
      android.server.wm.CrossAppDragAndDropTests,
      manually check the drag and drop behavior on test app.

Change-Id: Ie0c477dd9e76dd5ec8b7aed6a472e24032777cc8

6 years agoClose mDragState immediately when error
Daichi Hirono [Fri, 10 Nov 2017 04:51:02 +0000 (13:51 +0900)]
Close mDragState immediately when error

Previously if we encounter an error at performDrag, it sometimes just
returns and lets MSG_DRAG_START_TIMEOUT clean up the drag state.

It means users cannot start another drag and drop operation before
timeout.

The CL fix the error handling so that it immediately cleans the drag
state on errors.

Bug: 69141835
Test: android.server.wm.CrossAppDragAndDropTests, manually check the
      drag and drop behavior on test app.
Change-Id: Ibc5784a842eed77e2fa082d8f38d69acc9954e3e

6 years agoMerge "AAPT2: Remove unused command line option."
TreeHugger Robot [Wed, 13 Dec 2017 03:06:54 +0000 (03:06 +0000)]
Merge "AAPT2: Remove unused command line option."

6 years agoMerge "Add getDisallowedSystemApps to DevicePolicyManager"
TreeHugger Robot [Wed, 13 Dec 2017 03:05:23 +0000 (03:05 +0000)]
Merge "Add getDisallowedSystemApps to  DevicePolicyManager"

6 years agoMerge "Add assisted dialing properties to the framework." am: f5bec0d781 am: 1d9fc9a490
Eric Erfanian [Wed, 13 Dec 2017 02:42:27 +0000 (02:42 +0000)]
Merge "Add assisted dialing properties to the framework." am: f5bec0d781 am: 1d9fc9a490
am: c73edfa2c6  -s ours

Change-Id: I96c354bc5895fe62eafcf1732593910d7aa9c70d

6 years agoMerge "AAPT2: Add validation for SDK version strings."
TreeHugger Robot [Wed, 13 Dec 2017 02:35:13 +0000 (02:35 +0000)]
Merge "AAPT2: Add validation for SDK version strings."

6 years agoMerge "Bluetooth: Add support for PBAP UI preference" am: 045d34ce76 am: cbfae42c3c
Hemant Gupta [Wed, 13 Dec 2017 02:24:30 +0000 (02:24 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference" am: 045d34ce76 am: cbfae42c3c
am: 3a670c3c04

Change-Id: Iac4dc53ca9c5e3ebdd0b68590de729e7c76d919d

6 years agoMerge "Add assisted dialing properties to the framework." am: f5bec0d781
Eric Erfanian [Wed, 13 Dec 2017 02:21:36 +0000 (02:21 +0000)]
Merge "Add assisted dialing properties to the framework." am: f5bec0d781
am: 1d9fc9a490

Change-Id: I176ce86a83406d2eecd33cf439085fcc13703a27

6 years agoMerge "Revert "Add panic detection to back button""
TreeHugger Robot [Wed, 13 Dec 2017 02:19:01 +0000 (02:19 +0000)]
Merge "Revert "Add panic detection to back button""

6 years agoMerge "Merge "Convert legacy-test, test-runner, and test-mock to Android.bp" am:...
Android Build Merger (Role) [Wed, 13 Dec 2017 02:15:41 +0000 (02:15 +0000)]
Merge "Merge "Convert legacy-test, test-runner, and test-mock to Android.bp" am: 9a3132d065 am: 4b7a6339cf am: cfd06fdc14  -s ours"

6 years agoMerge "Revert "Add tests for line breaking that considers overhangs""
TreeHugger Robot [Wed, 13 Dec 2017 02:15:16 +0000 (02:15 +0000)]
Merge "Revert "Add tests for line breaking that considers overhangs""

6 years agoMerge "Convert legacy-test, test-runner, and test-mock to Android.bp" am: 9a3132d065...
Colin Cross [Wed, 13 Dec 2017 02:12:30 +0000 (02:12 +0000)]
Merge "Convert legacy-test, test-runner, and test-mock to Android.bp" am: 9a3132d065 am: 4b7a6339cf
am: cfd06fdc14  -s ours

Change-Id: I2c773745d1739244839dd86a7c102f2ade3da211

6 years agoMerge "Tweak ripples"
TreeHugger Robot [Wed, 13 Dec 2017 02:07:50 +0000 (02:07 +0000)]
Merge "Tweak ripples"

6 years agoMerge "Allow additional tags when restoring TaskRecord."
TreeHugger Robot [Wed, 13 Dec 2017 02:06:32 +0000 (02:06 +0000)]
Merge "Allow additional tags when restoring TaskRecord."

6 years agoMerge "Remove unused target android.test.mock.sdk" am: a4c0fa769a am: 9d78e84a8e
Colin Cross [Wed, 13 Dec 2017 01:57:15 +0000 (01:57 +0000)]
Merge "Remove unused target android.test.mock.sdk" am: a4c0fa769a am: 9d78e84a8e
am: 39e11f5255  -s ours

Change-Id: I971ace608193c07a107aa5c454dc164b13a47070

6 years agoMerge "Bluetooth: Add support for PBAP UI preference" am: 045d34ce76
Hemant Gupta [Wed, 13 Dec 2017 01:56:18 +0000 (01:56 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference" am: 045d34ce76
am: cbfae42c3c

Change-Id: I16d491889a4877e6b5b9e602f29d35f83063cf61

6 years agoMerge "Convert legacy-test, test-runner, and test-mock to Android.bp" am: 9a3132d065
Colin Cross [Wed, 13 Dec 2017 01:51:09 +0000 (01:51 +0000)]
Merge "Convert legacy-test, test-runner, and test-mock to Android.bp" am: 9a3132d065
am: 4b7a6339cf

Change-Id: Ie2e2704b0de42b4eef032ad6bdca0f0e114bdd3e

6 years agoMerge "Add assisted dialing properties to the framework."
Eric Erfanian [Wed, 13 Dec 2017 01:46:02 +0000 (01:46 +0000)]
Merge "Add assisted dialing properties to the framework."
am: f5bec0d781

Change-Id: Ic4c118892b964e51136fb730070f2a6b6167b212

6 years agoMerge "Remove unused target android.test.mock.sdk" am: a4c0fa769a
Colin Cross [Wed, 13 Dec 2017 01:43:52 +0000 (01:43 +0000)]
Merge "Remove unused target android.test.mock.sdk" am: a4c0fa769a
am: 9d78e84a8e

Change-Id: Ie20f03c260883345171871196284f4dc2b6d06cd

6 years agoMerge "Merge "Separate android.test.mock from test-runner source" am: d330eeeeda...
Android Build Merger (Role) [Wed, 13 Dec 2017 01:41:12 +0000 (01:41 +0000)]
Merge "Merge "Separate android.test.mock from test-runner source" am: d330eeeeda am: 78160c2577 am: a5e61f3249  -s ours"

6 years agoMerge "Enable android.text.SpannableStringBuilderTest"
Siyamed Sinir [Wed, 13 Dec 2017 01:37:34 +0000 (01:37 +0000)]
Merge "Enable android.text.SpannableStringBuilderTest"

6 years agoMerge "Separate android.test.mock from test-runner source" am: d330eeeeda am: 78160c2577
Colin Cross [Wed, 13 Dec 2017 01:37:03 +0000 (01:37 +0000)]
Merge "Separate android.test.mock from test-runner source" am: d330eeeeda am: 78160c2577
am: a5e61f3249  -s ours

Change-Id: I2e266d39925ebd89018c1a61be85c558f0d026b3

6 years agoMerge "Bluetooth: Add support for PBAP UI preference"
Hemant Gupta [Wed, 13 Dec 2017 01:26:35 +0000 (01:26 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference"
am: 045d34ce76

Change-Id: I21f59d9a7df98f37009e730acaf63938304e3af2

6 years agoMerge "Convert services to Android.bp" am: 5319777274 am: b8500d4771
Colin Cross [Wed, 13 Dec 2017 01:20:59 +0000 (01:20 +0000)]
Merge "Convert services to Android.bp" am: 5319777274 am: b8500d4771
am: 0688ef8668  -s ours

Change-Id: I40945253867f1f6c4e4fb43c41ac31d99b719fcc

6 years agoMerge "Convert legacy-test, test-runner, and test-mock to Android.bp"
Colin Cross [Wed, 13 Dec 2017 01:20:42 +0000 (01:20 +0000)]
Merge "Convert legacy-test, test-runner, and test-mock to Android.bp"
am: 9a3132d065

Change-Id: I6a71d49ae1cc7f3cd5b65c523e3e64b3a882e4da

6 years agoMerge "Separate android.test.mock from test-runner source" am: d330eeeeda
Colin Cross [Wed, 13 Dec 2017 01:18:14 +0000 (01:18 +0000)]
Merge "Separate android.test.mock from test-runner source" am: d330eeeeda
am: 78160c2577

Change-Id: Ibaad59f9c605f1c9ae02a4b63f7c01e6b508f55d

6 years agoMerge "Copy hardware bitmap to a new hardware bitmap for new properties."
Chavi Weingarten [Wed, 13 Dec 2017 01:14:17 +0000 (01:14 +0000)]
Merge "Copy hardware bitmap to a new hardware bitmap for new properties."

6 years agoMerge "Remove unused target android.test.mock.sdk"
Colin Cross [Wed, 13 Dec 2017 01:11:46 +0000 (01:11 +0000)]
Merge "Remove unused target android.test.mock.sdk"
am: a4c0fa769a

Change-Id: I4ff49776db15ff17449ac615cefd3d2c5e3d2465

6 years agoMerge "Don't access disk on main thread"
TreeHugger Robot [Wed, 13 Dec 2017 01:11:17 +0000 (01:11 +0000)]
Merge "Don't access disk on main thread"

6 years agoMerge "Convert services to Android.bp" am: 5319777274
Colin Cross [Wed, 13 Dec 2017 01:08:56 +0000 (01:08 +0000)]
Merge "Convert services to Android.bp" am: 5319777274
am: b8500d4771

Change-Id: Idcfeb088fa73e679d18de2ce2dc2ba58cdc78af7

6 years agoMerge "Bluetooth: Add convenience method to convert connection state to string" am...
Jack He [Wed, 13 Dec 2017 01:08:26 +0000 (01:08 +0000)]
Merge "Bluetooth: Add convenience method to convert connection state to string" am: f7a69aeeab am: c57c5a9ba4
am: 061bc75d49

Change-Id: I6d8d75fdc686eebda4e0308168b956e1014b02d4

6 years agoAdd config resource specifying WallpaperManagerService
Daichi Hirono [Wed, 6 Dec 2017 01:34:18 +0000 (10:34 +0900)]
Add config resource specifying WallpaperManagerService

The config resource can be used by a vendor to override
WallpaperManagerService.

Bug: 69299523
Test: WallpaperServiceTests, WallpaperManagerTest, WallpaperColorTest,
      WallpaperInfoTest.

Change-Id: I9a38117c5b6fdc01aabb8293cde75485023970cd

6 years agoMerge "Separate android.test.mock from test-runner source"
Colin Cross [Wed, 13 Dec 2017 00:57:59 +0000 (00:57 +0000)]
Merge "Separate android.test.mock from test-runner source"
am: d330eeeeda

Change-Id: I7d578d55332942f8e3cdc7b44dc10b31cafc4174

6 years agoAAPT2: Remove unused command line option.
Shane Farmer [Wed, 13 Dec 2017 00:55:31 +0000 (16:55 -0800)]
AAPT2: Remove unused command line option.

--target-abis is never used and the same functionality works with
onfiguration files.

Test: Unit tests
Change-Id: Ic890eb0f15fade82cd85ba34d653d6cea3b79fb2
Bugs: b/70571736

6 years agoMerge "Bluetooth: Add convenience method to convert connection state to string" am...
Jack He [Wed, 13 Dec 2017 00:45:58 +0000 (00:45 +0000)]
Merge "Bluetooth: Add convenience method to convert connection state to string" am: f7a69aeeab
am: c57c5a9ba4

Change-Id: Id9b238bb2493455650351d595e4c7d2dd5005f2e

6 years agorenderthread: relax error handling for wide gamut EGL configs
Rob Herring [Wed, 29 Nov 2017 15:26:31 +0000 (09:26 -0600)]
renderthread: relax error handling for wide gamut EGL configs

It is valid to advertise EGL_EXT_pixel_format_float, but not have a
the requested EGL config. Instead of aborting, fallback to the default
behavior.

Change-Id: I6c602233b627dc2070364434fece57d3d0aab435
Cc: Romain Guy <romainguy@google.com>
Signed-off-by: Rob Herring <robh@kernel.org>
6 years agoMerge "Add assisted dialing properties to the framework."
Treehugger Robot [Wed, 13 Dec 2017 00:38:42 +0000 (00:38 +0000)]
Merge "Add assisted dialing properties to the framework."

6 years agoMerge "Convert services to Android.bp"
Colin Cross [Wed, 13 Dec 2017 00:38:41 +0000 (00:38 +0000)]
Merge "Convert services to Android.bp"
am: 5319777274

Change-Id: I41a44a2684fa322039d3979a663aa4b4e0ef73d7

6 years agoMerge "Bluetooth: Add support for PBAP UI preference"
Treehugger Robot [Wed, 13 Dec 2017 00:30:42 +0000 (00:30 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference"

6 years agoAAPT2: Remove signatures from multi-APK artifacts.
Shane Farmer [Fri, 29 Sep 2017 18:59:25 +0000 (11:59 -0700)]
AAPT2: Remove signatures from multi-APK artifacts.

Remove signer files (.SF and public key) as well as the original
manifest file from any output artifacts. Since the artifacts are not
signed, we want to remove the original signature and manifest. The APK
signer tool will add these back later.

Updated the context wrapper to enable verbose mode to be cleared. This
lets us have more specific log messages when splitting an APK as at this
point the artifacts and filters are more interesting than the files removed.

Test: Manually split an APK and verified the filles were removed while
      leaving the other META-INF entries.
Test: Unit tests

Change-Id: Ia59993b5570f802130c6e3ba42398a00821061ea

6 years agoAAPT2: Add validation for SDK version strings.
Shane Farmer [Wed, 6 Dec 2017 22:39:10 +0000 (14:39 -0800)]
AAPT2: Add validation for SDK version strings.

Ensure that the configured min max and target SDK versions of the
android-sdk configuration item are correct. This will prevent AAPT2
crashing when it tries to dereference the Android SDK version to update
the manifest.

The test for the latest development SDK version has also been made
future proof by using the SDK constants.

Test: unit tests
Test: manually split an APK
Change-Id: I1ffa90ba2d96cab0cbfa4bd75ef37a50d986852d

6 years agoMerge "Bluetooth: Add convenience method to convert connection state to string"
Jack He [Wed, 13 Dec 2017 00:02:25 +0000 (00:02 +0000)]
Merge "Bluetooth: Add convenience method to convert connection state to string"
am: f7a69aeeab

Change-Id: I6be2177bcc81cd16824fc20b2dbf7a8a6c9464b8

6 years agoMerge "OMS: Only allow trusted overlays to be registered." into oc-mr1-dev am: a06854e77a
Adam Lesinski [Tue, 12 Dec 2017 23:50:43 +0000 (23:50 +0000)]
Merge "OMS: Only allow trusted overlays to be registered." into oc-mr1-dev am: a06854e77a
am: 6036449709  -s ours

Change-Id: I1b693c31925b4076744a482d31fcb82bc7399834

6 years agoAllow additional tags when restoring TaskRecord.
Garfield Tan [Tue, 12 Dec 2017 22:37:42 +0000 (14:37 -0800)]
Allow additional tags when restoring TaskRecord.

Factory method can override the new method to handle additional tags for
the convenience of restoring additional states.

W/o this change the subclass factory will have to copy the logic from
base class to add additional tags.

Bug: 70029361
Test: go/wm-smoke on sailfish w/o Pip steps. TaskRecordTests pass.
Change-Id: Idc87896479566a2c03c3f87c62b4a83a843a026e

6 years agoMerge "OMS: Only allow trusted overlays to be registered." into oc-mr1-dev
Adam Lesinski [Tue, 12 Dec 2017 23:36:57 +0000 (23:36 +0000)]
Merge "OMS: Only allow trusted overlays to be registered." into oc-mr1-dev
am: a06854e77a

Change-Id: I9d4f214b3911fb66fd2baa8ad83e8450246c3c80

6 years agoMerge "Convert legacy-test, test-runner, and test-mock to Android.bp"
Colin Cross [Tue, 12 Dec 2017 23:27:15 +0000 (23:27 +0000)]
Merge "Convert legacy-test, test-runner, and test-mock to Android.bp"

6 years agoMerge "Remove unused target android.test.mock.sdk"
Colin Cross [Tue, 12 Dec 2017 23:26:41 +0000 (23:26 +0000)]
Merge "Remove unused target android.test.mock.sdk"

6 years agoMerge "Separate android.test.mock from test-runner source"
Colin Cross [Tue, 12 Dec 2017 23:25:48 +0000 (23:25 +0000)]
Merge "Separate android.test.mock from test-runner source"

6 years agoMerge "Convert services to Android.bp"
Colin Cross [Tue, 12 Dec 2017 23:25:09 +0000 (23:25 +0000)]
Merge "Convert services to Android.bp"

6 years agoConvert legacy-test, test-runner, and test-mock to Android.bp
Colin Cross [Thu, 7 Dec 2017 21:11:06 +0000 (13:11 -0800)]
Convert legacy-test, test-runner, and test-mock to Android.bp

See build/soong/README.md for more information.

Test: m checkbuild
Change-Id: I110f752d2fa94c44581f20d4f308d9d429da0517
Merged-In: I110f752d2fa94c44581f20d4f308d9d429da0517
(cherry-picked from commit 2b7d71c7f8028741c2200bfeba8913b7f4f55cde)

6 years agoRemove unused target android.test.mock.sdk
Paul Duffin [Thu, 16 Nov 2017 13:02:37 +0000 (13:02 +0000)]
Remove unused target android.test.mock.sdk

Bug: 30188076
Test: make checkbuild

Change-Id: I9b613969425e6c4d8700f6275484d6452a3cc3af
Merged-In: I9b613969425e6c4d8700f6275484d6452a3cc3af
(cherry picked from commit 10d0658bf020197c16264a1da4637e0d20ee6445)

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 12 Dec 2017 23:23:49 +0000 (15:23 -0800)]
Import translations. DO NOT MERGE

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

6 years agoSeparate android.test.mock from test-runner source
Paul Duffin [Wed, 15 Nov 2017 11:39:14 +0000 (11:39 +0000)]
Separate android.test.mock from test-runner source

Extracts the source for the android.test.mock library from the
frameworks/base/test-runner directory into its own
frameworks/base/test-mock directory. They are already treated separately
at runtime and compile time so this just makes the separation complete.

Bug: 30188076
Test: make checkbuild
Change-Id: I20e5b06ba79677e76117c82e9f9e2ecd15e5fed6
Merged-In: I20e5b06ba79677e76117c82e9f9e2ecd15e5fed6
(cherry picked from commit e254526f0fe5d22681555bd4a00b7ee96fee1dc1)

6 years agoConvert services to Android.bp
Colin Cross [Tue, 5 Dec 2017 17:46:29 +0000 (09:46 -0800)]
Convert services to Android.bp

See build/soong/README.md for more information.

Test: m checkbuild
Change-Id: I417409281c928ea667d937090d2a0d9d72a449a2
Merged-In: I417409281c928ea667d937090d2a0d9d72a449a2
Exempt-From-Owner-Approval: trivial conversion
(cherry-picked from commit e0b2ee52d2f274a2d46b2e6695e42d2764c39fa7)

6 years agoMerge "Fix android.text.format.FormatterText expectation"
Siyamed Sinir [Tue, 12 Dec 2017 22:55:04 +0000 (22:55 +0000)]
Merge "Fix android.text.format.FormatterText expectation"

6 years agoRevert "Add tests for line breaking that considers overhangs"
Seigo Nonaka [Tue, 12 Dec 2017 22:54:18 +0000 (22:54 +0000)]
Revert "Add tests for line breaking that considers overhangs"

We won't support overhang in next releases and my new line breaker doesn't support overhangs.
Let me revert the test cases.

This reverts commit d170532c8e87490623d9f75935d54bc08991bfbd.

Change-Id: Ie8a4191147dc48a405fbfdb405be40fd92d540e2

6 years agoCopy hardware bitmap to a new hardware bitmap for new properties.
chaviw [Tue, 12 Dec 2017 22:46:40 +0000 (14:46 -0800)]
Copy hardware bitmap to a new hardware bitmap for new properties.

The previous code copied the hardware bitmap to a software bitmap so
properties like size and matrix could be updated. Instead, copy the
hardware bitmap to another hardware bitmap when adjusting the
properties.

Test: Screenshots notification from status bar and lock screen contain
the new bitmap with the correct size.
Fixes: 69929720

Change-Id: Ia0bd20a0085a15cfebbe0dfffddcd834363a6964

6 years agoMerge "Bluetooth: Add convenience method to convert connection state to string"
Treehugger Robot [Tue, 12 Dec 2017 22:41:13 +0000 (22:41 +0000)]
Merge "Bluetooth: Add convenience method to convert connection state to string"

6 years agoMerge "OMS: Only allow trusted overlays to be registered." into oc-mr1-dev
TreeHugger Robot [Tue, 12 Dec 2017 21:48:11 +0000 (21:48 +0000)]
Merge "OMS: Only allow trusted overlays to be registered." into oc-mr1-dev

6 years agoFix trySetQuietModeDisabled may introduce deadlock
Tony Mak [Tue, 12 Dec 2017 19:50:57 +0000 (19:50 +0000)]
Fix trySetQuietModeDisabled may introduce deadlock

1. UserController.mLock is held
2. mUnlockProgress.addListener
3. Find that it is unlocked and hence, call the onFinished callback
   right away.
4. Trying to call the callback in UMS, which calls startIntentSender.
5. startIntentSender requires AMS lock.

So, if there is another thread is holding AMS lock and
waiting for UserController.mLock, deadlock happens.

Test: Try turning on / off work mode

Change-Id: I341c2f1572302863d7972742142aa0f3948cd524

6 years agoMerge "Adds getPort (hidden) to AudioDeviceInfo class"
Hongwei Wang [Tue, 12 Dec 2017 21:42:58 +0000 (21:42 +0000)]
Merge "Adds getPort (hidden) to AudioDeviceInfo class"

6 years agoMerge "DisplayCutout: Only dispatch to apps requesting it"
Adrian Roos [Tue, 12 Dec 2017 21:15:59 +0000 (21:15 +0000)]
Merge "DisplayCutout: Only dispatch to apps requesting it"

6 years agoAPI that reports first SDK level of the device.
Jeff Sharkey [Tue, 12 Dec 2017 20:51:32 +0000 (13:51 -0700)]
API that reports first SDK level of the device.

This is different from SDK_INT, which can change due to OTA
software updates.

Test: cts-tradefed run commandAndExit cts-dev -m CtsOsTestCases -t android.os.cts.BuildTest
Bug: 69270887
Change-Id: Ic3f4b22b25dc08f3fbdbdf7622c953323447ea01

6 years agoEnable android.text.SpannableStringBuilderTest
Siyamed Sinir [Tue, 12 Dec 2017 20:55:22 +0000 (12:55 -0800)]
Enable android.text.SpannableStringBuilderTest

Test: bit FrameworksCoreTests:android.text.SpannableStringBuilderTest
Change-Id: Ie70f15a6de0cb68099119f1da90959cbd1319e8a

6 years agoMerge "Remove data binding from platform docs"
Yigit Boyar [Tue, 12 Dec 2017 20:37:47 +0000 (20:37 +0000)]
Merge "Remove data binding from platform docs"

6 years agoFix android.text.format.FormatterText expectation
Siyamed Sinir [Tue, 12 Dec 2017 20:37:00 +0000 (12:37 -0800)]
Fix android.text.format.FormatterText expectation

Test: bit FrameworksCoreTests:android.text.format.FormatterTest
Bug: 70506734
Change-Id: Idb621e5deb34694765101234a080653b31e6d897

6 years agoMerge "Make BluetoothPbap implement BluetoothProfile (1/3)" am: 5b6b73800c am: 64d81fbf33
Hansong Zhang [Tue, 12 Dec 2017 19:35:42 +0000 (19:35 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (1/3)" am: 5b6b73800c am: 64d81fbf33
am: 9c6044771f

Change-Id: I0390d33d0d56b29e3632a4fe78106fcae4fcfb32