OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Moar changes for Autofill Field Classification mechanism:"
TreeHugger Robot [Thu, 7 Dec 2017 17:35:23 +0000 (17:35 +0000)]
Merge "Moar changes for Autofill Field Classification mechanism:"

6 years agoMerge "There is only one Generic.kl."
TreeHugger Robot [Thu, 7 Dec 2017 17:23:50 +0000 (17:23 +0000)]
Merge "There is only one Generic.kl."

6 years agoMerge "Flatten dependency hierarchy of legacy-android-test"
TreeHugger Robot [Thu, 7 Dec 2017 17:19:27 +0000 (17:19 +0000)]
Merge "Flatten dependency hierarchy of legacy-android-test"

6 years agoRevert "Add odm sepolicy support to SELinuxMMAC.java"
Bo Hu [Wed, 6 Dec 2017 22:17:32 +0000 (22:17 +0000)]
Revert "Add odm sepolicy support to SELinuxMMAC.java"

This reverts commit fffa6d238a31ac5e7b30a6e1d852c8c2cc22af1d.

Reason for revert: broke mac build

b/70273082

FAILED: out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil
/bin/bash -c "(out/host/darwin-x86/bin/version_policy -b out/target/product/generic_x86/obj/FAKE/selinux_policy_intermediates/plat_pub_policy.cil -t out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_policy_raw.cil -n 10000.0 -o out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil.tmp ) && (grep -Fxv -f out/target/product/generic_x86/obj/ETC/plat_pub_versioned.cil_intermediates/plat_pub_versioned.cil out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil.tmp > out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil ) && (out/host/darwin-x86/bin/secilc -m -M true -G -N -c 30  out/target/product/generic_x86/obj/ETC/plat_sepolicy.cil_intermediates/plat_sepolicy.cil out/target/product/generic_x86/obj/ETC/plat_pub_versioned.cil_intermediates/plat_pub_versioned.cil out/target/product/generic_x86/obj/ETC/10000.0.cil_intermediates/10000.0.cil out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil -o /dev/null -f /dev/null )"
Parsing out/target/product/generic_x86/obj/FAKE/selinux_policy_intermediates/plat_pub_policy.cil
Parsing out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_policy_raw.cil
grep: out of memory

(cherry picked from commit 11f214d8f3b52dccb231990b5ac04c1e0f05617b)

Change-Id: If48fffc0bd9a208363fd11fb359a1e68cb59de62

6 years agoMerge "Binding on-demand #4: PerformClearTask usage"
Bernardo Rufino [Thu, 7 Dec 2017 11:15:29 +0000 (11:15 +0000)]
Merge "Binding on-demand #4: PerformClearTask usage"

6 years agoFlatten dependency hierarchy of legacy-android-test
Paul Duffin [Tue, 5 Dec 2017 18:36:56 +0000 (18:36 +0000)]
Flatten dependency hierarchy of legacy-android-test

Previous changes statically included legacy-android-test in preparation
for removing android.test.* and junit.* classes from the android.jar.
Unfortunately, that lead to duplicate classes between APKs and the
bootclasspath which caused build problems (Proguard) and also runtime
problems (when targeting and running on older releases).

Switching from statically including the classes to using the runtime
libraries cannot be done in one step because legacy-android-test is
statically included in libraries which are used in many APKs and so
removing it from those libraries requires that all APKs be updated at
once. Doing that atomically across dozens of projects is not practical.

This change modifies APKS that statically include the
legacy-android-test library indirectly.

* If the APK manifest uses the android.test.runner library then the APK
  is modified to stop statically including legacy-android-test and
  instead build against android.test.base/mock/runner libraries instead.

* Otherwise, the APK statically includes legacy-android-test.

Also, any libraries that statically include are modified to stop
statically including it and if it has source dependencies on the classes
is changed to build against the android.test.base/mock/runner libraries.

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.

* cmds/uiautomator/instrumentation/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because uiautomator-instrumentation is not a package so does not
    need to statically include the classes

* cmds/uiautomator/library/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    uiautomator.core has a source dependency on its classes

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because uiautomator.core is not a package so does not need to
    statically include the classes

* core/tests/BroadcastRadioTests/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    BroadcastRadioTests's source depends on its classes and because of
    these changes they are no longer present on the compilation path.
    The classes do not need to be statically included because the
    classes will be provided by the runtime, either from the default
    bootclasspath or from the android.test.runner library that
    BroadcastRadioTests specifies in its manifest.

* core/tests/coretests/Android.mk
    Added 'android.test.base' and 'android.test.mock' to
    LOCAL_JAVA_LIBRARIES because FrameworksCoreTests's source depends
    on their classes and because of these changes they are no longer
    present on the compilation path. The classes do not need to be
    statically included because the classes will be provided by the
    runtime, either from the default bootclasspath or from the
    android.test.runner library that FrameworksCoreTests specifies in
    its manifest.

* core/tests/featureflagtests/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    FrameworksCoreFeatureFlagTests's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path. The classes do not need to be statically included
    because the classes will be provided by the runtime, either from
    the default bootclasspath or from the android.test.runner library
    that FrameworksCoreFeatureFlagTests specifies in its manifest.

* core/tests/systemproperties/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    FrameworksCoreSystemPropertiesTests's source depends on its classes
    and because of these changes they are no longer present on the
    compilation path. The classes do not need to be statically included
    because the classes will be provided by the runtime, either from
    the default bootclasspath or from the android.test.runner library
    that FrameworksCoreSystemPropertiesTests specifies in its manifest.

* core/tests/utillib/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because frameworks-core-util-lib is not a package so does not need
    to statically include the classes

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    frameworks-core-util-lib has a source dependency on its classes

* core/tests/utiltests/Android.mk
    Added 'android.test.base' and 'android.test.mock' to
    LOCAL_JAVA_LIBRARIES because FrameworksUtilTests's source depends
    on their classes and because of these changes they are no longer
    present on the compilation path. The classes do not need to be
    statically included because the classes will be provided by the
    runtime, either from the default bootclasspath or from the
    android.test.runner library that FrameworksUtilTests specifies in
    its manifest.

* location/tests/locationtests/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    FrameworksLocationTests's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path. The classes do not need to be statically included because the
    classes will be provided by the runtime, either from the default
    bootclasspath or from the android.test.runner library that
    FrameworksLocationTests specifies in its manifest.

* lowpan/tests/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    FrameworksLowpanApiTests's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path. The classes do not need to be statically included
    because the classes will be provided by the runtime, either from
    the default bootclasspath or from the android.test.runner library
    that FrameworksLowpanApiTests specifies in its manifest.

* packages/Osu2/tests/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    OsuTests's source depends on its classes and because of these
    changes they are no longer present on the compilation path. The
    classes do not need to be statically included because the classes
    will be provided by the runtime, either from the default
    bootclasspath or from the android.test.runner library that OsuTests
    specifies in its manifest.

* packages/SettingsProvider/test/Android.mk
    Replaced 'legacy-android-test' with 'android.test.base' in
    LOCAL_JAVA_LIBRARIES because SettingsProviderTest's source depends
    on its classes. The classes do not need to be statically included
    because the classes will be provided by the runtime, either from
    the default bootclasspath or from the android.test.runner library
    that SettingsProviderTest specifies in its manifest.

* services/tests/notification/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    FrameworksNotificationTests's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path. The classes do not need to be statically included
    because the classes will be provided by the runtime, either from
    the default bootclasspath or from the android.test.runner library
    that FrameworksNotificationTests specifies in its manifest.

* services/tests/servicestests/Android.mk
    Replaced 'legacy-android-test' with 'android.test.base' and
    'android.test.runner' in LOCAL_JAVA_LIBRARIES because
    FrameworksServicesTests's source depends on their classes. The
    classes do not need to be statically included because the classes
    will be provided by the runtime, either from the default
    bootclasspath or from the android.test.runner library that
    FrameworksServicesTests specifies in its manifest.

* services/tests/shortcutmanagerutils/Android.mk
    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    ShortcutManagerTestUtils has a source dependency on its classes

* tests/AppLaunch/Android.mk
    Replaced 'legacy-android-test' with 'android.test.base' and
    'android.test.runner' in LOCAL_JAVA_LIBRARIES because AppLaunch's
    source depends on their classes. The classes do not need to be
    statically included because the classes will be provided by the
    runtime, either from the default bootclasspath or from the
    android.test.runner library that AppLaunch specifies in its
    manifest.

* tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk
    Replaced 'legacy-android-test' with 'android.test.base' in
    LOCAL_JAVA_LIBRARIES because SmartCamera-tests's source depends on
    its classes. The classes do not need to be statically included
    because the classes will be provided by the runtime, either from
    the default bootclasspath or from the android.test.runner library
    that SmartCamera-tests specifies in its manifest.

* tests/ServiceCrashTest/Android.mk
    Replaced 'legacy-android-test' with 'android.test.base' in
    LOCAL_JAVA_LIBRARIES because ServiceCrashTest's source depends on
    its classes. The classes do not need to be statically included
    because the classes will be provided by the runtime, either from
    the default bootclasspath or from the android.test.runner library
    that ServiceCrashTest specifies in its manifest.

* tests/net/Android.mk
    Added 'android.test.base' and 'android.test.mock' to
    LOCAL_JAVA_LIBRARIES because FrameworksNetTests's source depends on
    their classes and because of these changes they are no longer
    present on the compilation path. The classes do not need to be
    statically included because the classes will be provided by the
    runtime, either from the default bootclasspath or from the
    android.test.runner library that FrameworksNetTests specifies in
    its manifest.

* tests/testables/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because testables is not a package so does not need to statically
    include the classes

    Added 'android.test.mock' to LOCAL_JAVA_LIBRARIES because testables
    has a source dependency on its classes

* tests/utils/testutils/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because frameworks-base-testutils is not a package so does not need
    to statically include the classes

    Added 'android.test.base' and 'android.test.mock' to
    LOCAL_JAVA_LIBRARIES because frameworks-base-testutils has a source
    dependency on their classes

* wifi/tests/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    FrameworksWifiApiTests's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path. The classes do not need to be statically included because the
    classes will be provided by the runtime, either from the default
    bootclasspath or from the android.test.runner library that
    FrameworksWifiApiTests specifies in its manifest.

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

6 years agoadd integer array values to KeyValueListParser
Chris Wren [Wed, 6 Dec 2017 05:12:17 +0000 (00:12 -0500)]
add integer array values to KeyValueListParser

Test: atest NotificationSnoozeTest KeyValueListParserTest AlwaysOnDisplayPolicyTest
Change-Id: Ia26cd38258c2cf83558a9a39a6b1c2ec6dedfcb1

6 years agoMerge "docs: Fixed key generator initialize method call." into oc-mr1-dev am: a1150e90e0
Kevin Hufnagle [Thu, 7 Dec 2017 05:47:03 +0000 (05:47 +0000)]
Merge "docs: Fixed key generator initialize method call." into oc-mr1-dev am: a1150e90e0
am: 9271333842

Change-Id: If099ce9dc3a35a1617de54c0187f718a0b391dcc

6 years agoMerge "Merge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2...
Android Build Merger (Role) [Thu, 7 Dec 2017 05:30:28 +0000 (05:30 +0000)]
Merge "Merge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)" am: 8ab47567b2 am: bee508cb6d am: 739c7bb9cb"

6 years agoMerge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)" am...
Hansong Zhang [Thu, 7 Dec 2017 05:24:39 +0000 (05:24 +0000)]
Merge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)" am: 8ab47567b2 am: bee508cb6d
am: 739c7bb9cb

Change-Id: I9f711efc0c42cd2a0055fe463387fde3236c7459

6 years agoMerge "Merge "Auto-format BluetoothManagerService.java" am: 004731bee7 am: c1cd03b60c...
Android Build Merger (Role) [Thu, 7 Dec 2017 05:17:46 +0000 (05:17 +0000)]
Merge "Merge "Auto-format BluetoothManagerService.java" am: 004731bee7 am: c1cd03b60c am: ba2fd2b68e"

6 years agoMerge "Auto-format BluetoothManagerService.java" am: 004731bee7 am: c1cd03b60c
Myles Watson [Thu, 7 Dec 2017 05:15:56 +0000 (05:15 +0000)]
Merge "Auto-format BluetoothManagerService.java" am: 004731bee7 am: c1cd03b60c
am: ba2fd2b68e

Change-Id: Iead30086e1184531e6efe0a8e90cd0430d01cb26

6 years agoMerge "Merge "Auto-format BluetoothAdapter.java" am: 5416559d1c am: 03e1dfa444 am...
Android Build Merger (Role) [Thu, 7 Dec 2017 05:10:17 +0000 (05:10 +0000)]
Merge "Merge "Auto-format BluetoothAdapter.java" am: 5416559d1c am: 03e1dfa444 am: 158eae223d"

6 years agoMerge "Auto-format BluetoothAdapter.java" am: 5416559d1c am: 03e1dfa444
Myles Watson [Thu, 7 Dec 2017 05:07:50 +0000 (05:07 +0000)]
Merge "Auto-format BluetoothAdapter.java" am: 5416559d1c am: 03e1dfa444
am: 158eae223d

Change-Id: I4f703af6fbffde4287555db1eb2b03e857a50008

6 years agoMerge "Removed vibrations when icons go into / out of the shelf"
TreeHugger Robot [Thu, 7 Dec 2017 05:04:21 +0000 (05:04 +0000)]
Merge "Removed vibrations when icons go into / out of the shelf"

6 years agoMerge "Allow subclass of TaskRecord."
TreeHugger Robot [Thu, 7 Dec 2017 04:40:46 +0000 (04:40 +0000)]
Merge "Allow subclass of TaskRecord."

6 years agoMerge "docs: Fixed key generator initialize method call." into oc-mr1-dev
Kevin Hufnagle [Thu, 7 Dec 2017 03:47:42 +0000 (03:47 +0000)]
Merge "docs: Fixed key generator initialize method call." into oc-mr1-dev
am: a1150e90e0

Change-Id: Ifc28fb85d206211e1206e2072aa427edcd21ba8e

6 years agoMerge "Guide user towards adoption when card is "empty"."
Jeff Sharkey [Thu, 7 Dec 2017 03:10:06 +0000 (03:10 +0000)]
Merge "Guide user towards adoption when card is "empty"."

6 years agoMerge "Fix a deadlock in statsd."
TreeHugger Robot [Thu, 7 Dec 2017 01:51:58 +0000 (01:51 +0000)]
Merge "Fix a deadlock in statsd."

6 years agoMerge "Move notification service tests to be ui services tests"
TreeHugger Robot [Thu, 7 Dec 2017 01:16:28 +0000 (01:16 +0000)]
Merge "Move notification service tests to be ui services tests"

6 years agoRemoved vibrations when icons go into / out of the shelf
Selim Cinek [Mon, 4 Dec 2017 15:42:33 +0000 (16:42 +0100)]
Removed vibrations when icons go into / out of the shelf

This also removed binder transactions happening in every frame
and improves it for the opening case to a listener.

Change-Id: I8052848c622ca468b6daf17f8fbe335eac166255
Fixes:  65206902
Bug: 69933777
Test: open panel, observe vibrations

6 years agoMerge "Convert services/core/jni to Android.bp"
TreeHugger Robot [Thu, 7 Dec 2017 00:52:53 +0000 (00:52 +0000)]
Merge "Convert services/core/jni to Android.bp"

6 years agoMerge "Use prebuilt android.test.base.jar for app builds"
TreeHugger Robot [Thu, 7 Dec 2017 00:40:47 +0000 (00:40 +0000)]
Merge "Use prebuilt android.test.base.jar for app builds"

6 years agoMerge "Extreme battery saver: Allow lowering framerate for experiments."
Makoto Onuki [Thu, 7 Dec 2017 00:18:56 +0000 (00:18 +0000)]
Merge "Extreme battery saver: Allow lowering framerate for experiments."

6 years agoMerge "Saving USB Device connect/disconnect info."
TreeHugger Robot [Thu, 7 Dec 2017 00:14:12 +0000 (00:14 +0000)]
Merge "Saving USB Device connect/disconnect info."

6 years agoMerge "Prefer std::string over String8"
TreeHugger Robot [Thu, 7 Dec 2017 00:10:05 +0000 (00:10 +0000)]
Merge "Prefer std::string over String8"

6 years agoMerge "Fix issue where scrims would not go away"
TreeHugger Robot [Wed, 6 Dec 2017 23:58:44 +0000 (23:58 +0000)]
Merge "Fix issue where scrims would not go away"

6 years agoFix a deadlock in statsd.
Yao Chen [Wed, 6 Dec 2017 23:35:50 +0000 (15:35 -0800)]
Fix a deadlock in statsd.

Test: manual
Change-Id: I7676713f604699737d819ac67fe49bc5b5d8cf98

6 years agoMerge changes from topics "moar_fields", "fc_refactor_score"
TreeHugger Robot [Wed, 6 Dec 2017 23:03:17 +0000 (23:03 +0000)]
Merge changes from topics "moar_fields", "fc_refactor_score"

* changes:
  Implemented autofill field classification on multiple fields and user data.
  Refactored the FieldsClassification score mechanism.

6 years agoMerge "Introduce getProfileSwitchingIcon/Label In CrossProfileApps"
TreeHugger Robot [Wed, 6 Dec 2017 22:56:17 +0000 (22:56 +0000)]
Merge "Introduce getProfileSwitchingIcon/Label In CrossProfileApps"

6 years agobug fix for StatsLogEventWraper tag id
Chenjie Yu [Wed, 6 Dec 2017 06:34:34 +0000 (22:34 -0800)]
bug fix for StatsLogEventWraper tag id
bug fix for ConfigManager fake config

Test: cts test
Change-Id: Ia07992dffb6520074c908151c96da1aa931f97f0

6 years agoMerge "Fix CTS tests failing due to job throttling"
TreeHugger Robot [Wed, 6 Dec 2017 22:33:41 +0000 (22:33 +0000)]
Merge "Fix CTS tests failing due to job throttling"

6 years agoMerge "Change default dnd rules"
TreeHugger Robot [Wed, 6 Dec 2017 22:31:02 +0000 (22:31 +0000)]
Merge "Change default dnd rules"

6 years agoMerge "Deprecate inKeyguardRestrictedInputMode"
TreeHugger Robot [Wed, 6 Dec 2017 22:27:51 +0000 (22:27 +0000)]
Merge "Deprecate inKeyguardRestrictedInputMode"

6 years agoMerge "Extreme battery saver: do not disable animation"
TreeHugger Robot [Wed, 6 Dec 2017 22:23:10 +0000 (22:23 +0000)]
Merge "Extreme battery saver: do not disable animation"

6 years agoGuide user towards adoption when card is "empty".
Jeff Sharkey [Wed, 6 Dec 2017 22:22:05 +0000 (15:22 -0700)]
Guide user towards adoption when card is "empty".

When a newly inserted SD card is empty, we'd like to guide the user
towards adopting it.  Similarly, if the card contains personal media
like photos, we'd like to guide the user towards using it as portable
storage.

Do this by quickly hunting around on the card for files under various
well-known directories.  Special logic to ignore bundled "helper"
apps included from the SD card factory.

Test: bit FrameworksCoreTests:android.os.EnvironmentTest
Bug: 69128181
Change-Id: I10e43d2e76379fac5137eb3810742c33f5f57d80

6 years agoMerge "Rename snapshotProfile to createProfileSnapshot for consistency"
TreeHugger Robot [Wed, 6 Dec 2017 22:11:28 +0000 (22:11 +0000)]
Merge "Rename snapshotProfile to createProfileSnapshot for consistency"

6 years agoMerge "docs: Fixed key generator initialize method call." into oc-mr1-dev
Kevin Hufnagle [Wed, 6 Dec 2017 22:03:50 +0000 (22:03 +0000)]
Merge "docs: Fixed key generator initialize method call." into oc-mr1-dev

6 years agoConvert services/core/jni to Android.bp
Colin Cross [Wed, 6 Dec 2017 01:33:58 +0000 (17:33 -0800)]
Convert services/core/jni to Android.bp

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

Test: m checkbuild
Change-Id: I11a9a39d14adc4c202c6a1725e92e52a38ff2585

6 years agoFix issue where scrims would not go away
Lucas Dupin [Wed, 6 Dec 2017 21:59:25 +0000 (13:59 -0800)]
Fix issue where scrims would not go away

Change-Id: Ibb683d6bddadd5b670da28427d4801e03d575bd8
Fixes: 70245015
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java

6 years agoExtreme battery saver: Allow lowering framerate for experiments.
John Reck [Mon, 25 Sep 2017 17:27:21 +0000 (10:27 -0700)]
Extreme battery saver: Allow lowering framerate for experiments.

Bug: 68769804
Test: manual
Change-Id: Ic0c95f32c7ba6d86a997997e480e6d8a5f228f25

6 years agoMerge "targetSdkVersion float property sanitization"
TreeHugger Robot [Wed, 6 Dec 2017 21:39:03 +0000 (21:39 +0000)]
Merge "targetSdkVersion float property sanitization"

6 years agoMerge "Remove obsolete scrim transition"
Lucas Dupin [Wed, 6 Dec 2017 21:24:12 +0000 (21:24 +0000)]
Merge "Remove obsolete scrim transition"

6 years agoMoar changes for Autofill Field Classification mechanism:
Felipe Leme [Wed, 6 Dec 2017 17:22:43 +0000 (09:22 -0800)]
Moar changes for Autofill Field Classification mechanism:

- Changed max score to float (range 0.0 - 1.0).
- Replaced getTopMatch() to getMatches().
- Created a Scorer interface with a default edit-distance implementation.
- Added a isFieldClassificationEnabled() method.

Test: atest CtsAutoFillServiceTestCases:FieldsClassificationTest
Test: atest CtsAutoFillServiceTestCases:EditDistanceScorerTest
Test: atest CtsAutoFillServiceTestCases:UserDataTest
Test: atest FrameworksCoreTests:SettingsBackupTest

Bug: 68045531

Change-Id: Ice6cbf548053b86b47980d9664a3a21219c0ff08

6 years agoAllow subclass of TaskRecord.
Garfield Tan [Wed, 6 Dec 2017 00:43:46 +0000 (16:43 -0800)]
Allow subclass of TaskRecord.

OEM can set TaskRecordFactory to create their own TaskRecord to support
more states.

Bug: 70029361
Test: go/wm-smoke w/o PiP because sailfish doesn't seem to have that.
Change-Id: I45d01e65c97fd6bc7857021d9c8bedbc249cd433

6 years agoExtreme battery saver: do not disable animation
Makoto Onuki [Wed, 6 Dec 2017 20:51:20 +0000 (12:51 -0800)]
Extreme battery saver: do not disable animation

Bug:68769804
Test: manual
Change-Id: I82fefa5045258ec1adee0f4ab27d31b7950e4a8e

6 years agoMerge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)" am...
Hansong Zhang [Wed, 6 Dec 2017 20:50:07 +0000 (20:50 +0000)]
Merge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)" am: 8ab47567b2
am: bee508cb6d

Change-Id: Ie9aad08a93924655fee5b7f3c7abd77781985ad7

6 years agoChange default dnd rules
Beverly [Mon, 4 Dec 2017 21:30:11 +0000 (16:30 -0500)]
Change default dnd rules

- Created new DND Sleeping rule
- Weekend and weeknight automatic DND rules are no longer default,
they are considered user-added
- enforceDefaultRulesExist in ZenModeHelper ensures default rules are
always in the DND automatic rule list (especially important on upgrade
from O -> P)

Bug: 63077372
Test: manual
Change-Id: Ie6e89bb5d7b4483c297c142c4c56d03caa9a53e8

6 years agoMerge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)"
Hansong Zhang [Wed, 6 Dec 2017 20:33:29 +0000 (20:33 +0000)]
Merge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)"
am: 8ab47567b2

Change-Id: I9ea9a2d7bd5a81816fb652b643f345459bc2fdc5

6 years agoMerge "SoundPool: remove unused header file"
TreeHugger Robot [Wed, 6 Dec 2017 20:30:16 +0000 (20:30 +0000)]
Merge "SoundPool: remove unused header file"

6 years agoMerge "Auto-format BluetoothManagerService.java" am: 004731bee7
Myles Watson [Wed, 6 Dec 2017 20:28:20 +0000 (20:28 +0000)]
Merge "Auto-format BluetoothManagerService.java" am: 004731bee7
am: c1cd03b60c

Change-Id: I764db41f981d271eeaef7f9a3e1112f7c8857f38

6 years agoMerge "Auto-format BluetoothAdapter.java" am: 5416559d1c
Myles Watson [Wed, 6 Dec 2017 20:22:01 +0000 (20:22 +0000)]
Merge "Auto-format BluetoothAdapter.java" am: 5416559d1c
am: 03e1dfa444

Change-Id: I03f20ed4511ffd2d5bfa55e57d8895635e9ab165

6 years agoMerge "Make matchesSimple return false if there is a parsing error"
TreeHugger Robot [Wed, 6 Dec 2017 20:14:21 +0000 (20:14 +0000)]
Merge "Make matchesSimple return false if there is a parsing error"

6 years agoMerge "Auto-format BluetoothManagerService.java"
Myles Watson [Wed, 6 Dec 2017 20:10:37 +0000 (20:10 +0000)]
Merge "Auto-format BluetoothManagerService.java"
am: 004731bee7

Change-Id: If846012a106be1ef097a2bc7bb17db093224cfa0

6 years agoMerge "Auto-format BluetoothAdapter.java"
Myles Watson [Wed, 6 Dec 2017 20:04:07 +0000 (20:04 +0000)]
Merge "Auto-format BluetoothAdapter.java"
am: 5416559d1c

Change-Id: Ib5aa26901a97702fb4714dd89f24a112af59895b

6 years agoRename snapshotProfile to createProfileSnapshot for consistency
Calin Juravle [Tue, 5 Dec 2017 20:33:32 +0000 (12:33 -0800)]
Rename snapshotProfile to createProfileSnapshot for consistency

Test: build
Bug: 30934496
Change-Id: I602262d22509b279383ff2a71e38c8bae059498a

6 years agoMerge "Revert "Migrate some preference theme attributes from SettingsLib""
Antony Sargent [Wed, 6 Dec 2017 19:40:02 +0000 (19:40 +0000)]
Merge "Revert "Migrate some preference theme attributes from SettingsLib""

6 years agoMerge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)"
Treehugger Robot [Wed, 6 Dec 2017 19:34:22 +0000 (19:34 +0000)]
Merge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)"

6 years agoMerge "Auto-format BluetoothManagerService.java"
Treehugger Robot [Wed, 6 Dec 2017 19:22:44 +0000 (19:22 +0000)]
Merge "Auto-format BluetoothManagerService.java"

6 years agoMerge "Auto-format BluetoothAdapter.java"
Treehugger Robot [Wed, 6 Dec 2017 19:22:38 +0000 (19:22 +0000)]
Merge "Auto-format BluetoothAdapter.java"

6 years agoImplemented autofill field classification on multiple fields and user data.
Felipe Leme [Mon, 4 Dec 2017 22:57:09 +0000 (14:57 -0800)]
Implemented autofill field classification on multiple fields and user data.

Test: atest CtsAutoFillServiceTestCases:FieldsClassificationTest
Test: atest CtsAutoFillServiceTestCases:FieldsClassificationScorerTest
Test: atest CtsAutoFillServiceTestCases:UserDataTest

Bug: 68045531

Change-Id: Ia9252cb5b84236a76a1419f4a2669b2e933f5177

6 years agoRefactored the FieldsClassification score mechanism.
Felipe Leme [Mon, 4 Dec 2017 19:22:25 +0000 (11:22 -0800)]
Refactored the FieldsClassification score mechanism.

Before, FillEvent.getFieldsClassification() returned a map of remote ids and
scores. Now, it returns a Map of FieldClassication by AutofillId, which allows
multiple fields and scores for multiple user datas (although the initial
implementation supports only the top match for a field).

This is mostly a refactoring CL, as the implementation is still saving just one
user data entry and one field. But full support is coming next...

Test: atest CtsAutoFillServiceTestCases:FieldsClassificationTest
Test: atest CtsAutoFillServiceTestCases:UserDataTest
Test: atest CtsAutoFillServiceTestCases:FieldsClassificationScorerTest

Bug: 68045531

Change-Id: I08b29f24efbd527216f9bce2343e1bcd4b4554c0

6 years agoMerge "Introduce more user management APIs"
TreeHugger Robot [Wed, 6 Dec 2017 19:10:34 +0000 (19:10 +0000)]
Merge "Introduce more user management APIs"

6 years agoMerge "Don't persist LOCATION_GLOBAL_KILL_SWITCH"
Makoto Onuki [Wed, 6 Dec 2017 18:59:02 +0000 (18:59 +0000)]
Merge "Don't persist LOCATION_GLOBAL_KILL_SWITCH"

6 years agoMerge "Implement ArtManager#snapshotProfile API"
Calin Juravle [Wed, 6 Dec 2017 18:55:56 +0000 (18:55 +0000)]
Merge "Implement ArtManager#snapshotProfile API"

6 years agoMerge "Add connection serivce focus api interface"
Pengquan Meng [Wed, 6 Dec 2017 18:53:10 +0000 (18:53 +0000)]
Merge "Add connection serivce focus api interface"

6 years agoMerge "Introduce ServiceConnection#onNullBinding()"
Chris Tate [Wed, 6 Dec 2017 18:47:17 +0000 (18:47 +0000)]
Merge "Introduce ServiceConnection#onNullBinding()"

6 years agoMerge "[AWARE] Make PeerHandle comparable/hashable" into oc-mr1-dev am: 407809c911
Pankaj Kanwar [Wed, 6 Dec 2017 18:38:59 +0000 (18:38 +0000)]
Merge "[AWARE] Make PeerHandle comparable/hashable" into oc-mr1-dev am: 407809c911
am: 78720f8a69  -s ours

Change-Id: Icbfd89f81e145670b67832be6505c2ec2eae7e6e

6 years agoImplement ArtManager#snapshotProfile API
Calin Juravle [Thu, 30 Nov 2017 02:26:55 +0000 (18:26 -0800)]
Implement ArtManager#snapshotProfile API

Complete the implementation of ArtManager#snapshotProfile. The snapshot is
performed by calling the installer and then return to the caller via the
specified callback.

Bug: 30934496
Test: gts-tradefed -m GtsAndroidRuntimeManagerHostTestCases
Change-Id: I87131487846d91d79a56041445420376b61ca8e7

6 years agoFix CTS tests failing due to job throttling
Amith Yamasani [Wed, 6 Dec 2017 18:26:10 +0000 (10:26 -0800)]
Fix CTS tests failing due to job throttling

Instrumentation package should be immediately marked as active so
that the jobs aren't throttled.

Also, make sure special apps' buckets are correctly initialized.

Fixes: 68900608
Fixes: 69799327
Fixes: 69793822
Fixes: 69788489

Test: atest CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
      atest FrameworksServicesTests:AppIdleHistoryTests
      atest FrameworksServicesTests:AppStandbyControllerTests
      atest CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
      atest CtsNetSecConfigDownloadManagerTestCases
      atest CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
      cts-tradefed run cts-dev -m CtsAppUsageHostTestCases
      cts-tradefed run cts-dev -m CtsHostsideNetworkTests
      gts-tradefed run gts-dev -m GtsUsageStatsTestCases

Change-Id: Ic880b6f5ed1fdb7912613e882ccf7b2d4e388159

6 years agoMerge "[AWARE] Make PeerHandle comparable/hashable" into oc-mr1-dev
Pankaj Kanwar [Wed, 6 Dec 2017 18:25:41 +0000 (18:25 +0000)]
Merge "[AWARE] Make PeerHandle comparable/hashable" into oc-mr1-dev
am: 407809c911

Change-Id: If36f772a171b4c909878509cefc466bd09ffc142

6 years agoMerge "Adding widgetFeatures so that a provider can indicate a set of supported features"
Sunny Goyal [Wed, 6 Dec 2017 18:25:32 +0000 (18:25 +0000)]
Merge "Adding widgetFeatures so that a provider can indicate a set of supported features"

6 years agoMerge "Enable outgoing emergency calls in LockTask mode."
TreeHugger Robot [Wed, 6 Dec 2017 18:06:44 +0000 (18:06 +0000)]
Merge "Enable outgoing emergency calls in LockTask mode."

6 years agoMerge "Ensure activity stacks have unique ids."
Bryce Lee [Wed, 6 Dec 2017 18:05:51 +0000 (18:05 +0000)]
Merge "Ensure activity stacks have unique ids."

6 years agoMerge "Adds metadata to InstantAppResolveInfo"
TreeHugger Robot [Wed, 6 Dec 2017 18:05:32 +0000 (18:05 +0000)]
Merge "Adds metadata to InstantAppResolveInfo"

6 years agoRevert "Migrate some preference theme attributes from SettingsLib"
Antony Sargent [Wed, 6 Dec 2017 17:54:09 +0000 (17:54 +0000)]
Revert "Migrate some preference theme attributes from SettingsLib"

This reverts commit 77a89a6ca44ffd85f3bfba6cb42d089c288ea196.

Reason for revert: in b/70031670 we discovered some problems in
the support library side change (ag/3136307), and it will take a
little while to fix those problems so we need to temporarily
revert the support library changes to unblock a push of the
support library to google3.

Change-Id: I7d1732a384afb104118142aa79f3f53811acbe1a

6 years agoMerge "Change shared looper tag from ACTIVITY_MANAGER to SYSTEM_SERVER"
TreeHugger Robot [Wed, 6 Dec 2017 18:00:32 +0000 (18:00 +0000)]
Merge "Change shared looper tag from ACTIVITY_MANAGER to SYSTEM_SERVER"

6 years agoMove notification service tests to be ui services tests
Jason Monk [Wed, 6 Dec 2017 15:31:09 +0000 (10:31 -0500)]
Move notification service tests to be ui services tests

Also fix up ScheduleConditionProviderTest to not require weird looper
stuff.

Test: mm
Test: runtest --path ./
Test: atest .
Change-Id: Icb4c093b77d380f41d247600fe8a680fc9490093

6 years agoSaving USB Device connect/disconnect info.
Paul McLean [Thu, 30 Nov 2017 00:37:35 +0000 (17:37 -0700)]
Saving USB Device connect/disconnect info.

Test: Manual testing with Skylab, Mir, HTC dongle & Presonus AudioBox 22VSL
  (and various others)

Change-Id: Ice1bb889bc4655805d6b117988a5ebc4baa48cde

6 years agotargetSdkVersion float property sanitization
John Reck [Wed, 6 Dec 2017 17:46:13 +0000 (09:46 -0800)]
targetSdkVersion float property sanitization

Bug: 70242902
Test: CTS tests checking for exception still pass
Change-Id: I77dd772a6cb7077de058a3ca85b984c2c3f7321e

6 years agoMerge "[AWARE] Make PeerHandle comparable/hashable" into oc-mr1-dev
Pankaj Kanwar [Wed, 6 Dec 2017 17:42:20 +0000 (17:42 +0000)]
Merge "[AWARE] Make PeerHandle comparable/hashable" into oc-mr1-dev

6 years agoMerge "Allow a11y shortcut to toggle framework features"
Phil Weaver [Wed, 6 Dec 2017 17:39:04 +0000 (17:39 +0000)]
Merge "Allow a11y shortcut to toggle framework features"

6 years agoMerge "Limit access to package names in brightness slider data."
Kenny Guy [Wed, 6 Dec 2017 17:08:59 +0000 (17:08 +0000)]
Merge "Limit access to package names in brightness slider data."

6 years agoMerge "Use -Werror in frameworks/base/tools/streaming_proto"
Chih-hung Hsieh [Wed, 6 Dec 2017 17:08:46 +0000 (17:08 +0000)]
Merge "Use -Werror in frameworks/base/tools/streaming_proto"

6 years agoSoundPool: remove unused header file
Wei Jia [Wed, 6 Dec 2017 17:02:33 +0000 (09:02 -0800)]
SoundPool: remove unused header file

Test: compiles
Bug: 63934228
Change-Id: I48014e809a37c8a9ab27d4e4688dd7e604f80119

6 years agoMerge "Add latency logging for rotation"
TreeHugger Robot [Wed, 6 Dec 2017 16:54:45 +0000 (16:54 +0000)]
Merge "Add latency logging for rotation"

6 years agoMerge "Revert "Don't generate irrelevant a11y events - framework""
TreeHugger Robot [Wed, 6 Dec 2017 16:48:16 +0000 (16:48 +0000)]
Merge "Revert "Don't generate irrelevant a11y events - framework""

6 years agoMerge "Automatic zen rules are always priority only"
TreeHugger Robot [Wed, 6 Dec 2017 16:46:45 +0000 (16:46 +0000)]
Merge "Automatic zen rules are always priority only"

6 years agoMerge "SystemUI: Display RAT icon in quick setting when data is off" am: f845bbdfa4...
Wenting Xiong [Wed, 6 Dec 2017 16:43:16 +0000 (16:43 +0000)]
Merge "SystemUI: Display RAT icon in quick setting when data is off" am: f845bbdfa4 am: 592f539419
am: a6cadd4c4b

Change-Id: Ifd8243e5581775d33516e3cdb6059c627191c01f

6 years agoAuto-format BluetoothManagerService.java
Myles Watson [Tue, 28 Nov 2017 00:42:11 +0000 (16:42 -0800)]
Auto-format BluetoothManagerService.java

Test: build
Change-Id: If97c454a8e5aff34c4f8550f7ade3da413a200b7

6 years agoAuto-format BluetoothAdapter.java
Myles Watson [Tue, 28 Nov 2017 00:41:47 +0000 (16:41 -0800)]
Auto-format BluetoothAdapter.java

Test: build
Change-Id: I7bfc729373a24cceee05e443195640ff7f6d43b9

6 years agoMerge "SystemUI: Display RAT icon in quick setting when data is off" am: f845bbdfa4
Wenting Xiong [Wed, 6 Dec 2017 16:32:09 +0000 (16:32 +0000)]
Merge "SystemUI: Display RAT icon in quick setting when data is off" am: f845bbdfa4
am: 592f539419

Change-Id: I88d871f593ff64ebea1c36f42a8fe59d69d3b6f3

6 years agoMerge "SystemUI: Display RAT icon in quick setting when data is off"
Wenting Xiong [Wed, 6 Dec 2017 16:21:34 +0000 (16:21 +0000)]
Merge "SystemUI: Display RAT icon in quick setting when data is off"
am: f845bbdfa4

Change-Id: I3285f1f9e63cbf3d0487618b5ff636c7637ef9e4

6 years agoMerge "SystemUI: Display RAT icon in quick setting when data is off"
Treehugger Robot [Wed, 6 Dec 2017 16:07:28 +0000 (16:07 +0000)]
Merge "SystemUI: Display RAT icon in quick setting when data is off"

6 years agoMerge "Add system service for slices"
TreeHugger Robot [Wed, 6 Dec 2017 15:58:46 +0000 (15:58 +0000)]
Merge "Add system service for slices"

6 years agoAdds metadata to InstantAppResolveInfo
Patrick Baumann [Tue, 5 Dec 2017 00:12:52 +0000 (16:12 -0800)]
Adds metadata to InstantAppResolveInfo

This change introduces a metadata Bundle to the InstantAppResolveInfo
type to be passed along to the Instant App installer in the case of
resolution. This can be used by the resolver and installer to improve
launch by avoiding IPC to fetch needed data that lives in the resolver.

Change-Id: I0b9c168dd8803f5398d222384ebd436c787e1a48
Fixes: 68223794
Test: manual - modified resolver to populate data, verified in installer

6 years agoMerge "Provide start parameters via setters on ActivityStarter."
Bryce Lee [Wed, 6 Dec 2017 15:38:57 +0000 (15:38 +0000)]
Merge "Provide start parameters via setters on ActivityStarter."

6 years agoAdd latency logging for rotation
Jason Monk [Mon, 4 Dec 2017 16:08:41 +0000 (11:08 -0500)]
Add latency logging for rotation

Move LatencyTracker and sysui_latency to make this possible

Fixes: 67862696
Test: atest
platform_testing/tests/perf/PerfTransitionTest/src/com/android/apptransition/tests/LatencyTests.java#testRotationLatency

Change-Id: I42e3218355c162d4ba04b0f2c49e031156b5a357

6 years agoMerge "Fix inadvertent paste in the middle of a comment."
TreeHugger Robot [Wed, 6 Dec 2017 14:59:32 +0000 (14:59 +0000)]
Merge "Fix inadvertent paste in the middle of a comment."

6 years agoIntroduce more user management APIs
Alex Chau [Wed, 6 Dec 2017 14:38:25 +0000 (14:38 +0000)]
Introduce more user management APIs

- boolean stopUser(ComponentName admin, UserHandle userHandle)
- boolean logoutUser(ComponentName admin)
- List<UserHandle> getManageableUsers(ComponentName admin)
- Introduced Injector.binderWithCleanCallingIdentity

Bug: 67580550
Test: manually try each added API with a DPC on both primary and non-prijmray user.
Test: CTS tracked in b/67581357
Change-Id: I9789b9b29978d47bc22be6ecad6c5577e0f8eb5b