OSDN Git Service

android-x86/frameworks-base.git
6 years agoFix temporary file name strlcpy size.
Ivan Lozano [Fri, 15 Dec 2017 03:03:56 +0000 (19:03 -0800)]
Fix temporary file name strlcpy size.

The strlcpy size argument overflows on integer sanitized builds.

 runtime error: unsigned integer overflow: 11 - 35 cannot be represented
 in type 'unsigned long'

This doesn't cause a problem because strlcpy stops on the null in
TMP_FILE_PATTERN, and localTmpFileName is defined large enough to
contain TMP_FILE_PATTERN.

This changes the size argument to the remaining length in the buffer,
and removes an extraneous '/' write as TMP_FILE_PATTERN already begins
with '/'.

Bug: 30969751
Test: Reran CTS test which triggered the overflow.

Change-Id: I20b5deeaaa1a863324dfd1d94f3135920eae48d3

6 years agoMerge "Extend RotationPolicy to lock the screen at a specific rotation"
Mike Digman [Thu, 7 Dec 2017 21:53:13 +0000 (21:53 +0000)]
Merge "Extend RotationPolicy to lock the screen at a specific rotation"

6 years agoMerge "Extend TaskStackListener wrapper to support more methods"
Mike Digman [Thu, 7 Dec 2017 21:50:23 +0000 (21:50 +0000)]
Merge "Extend TaskStackListener wrapper to support more methods"

6 years agoMerge "New supported QuickViewConstant feature to delete a file."
Geoffrey Pitsch [Thu, 7 Dec 2017 21:32:29 +0000 (21:32 +0000)]
Merge "New supported QuickViewConstant feature to delete a file."

6 years agoMerge "Private API to turn off anti-aliasing for VectorDrawable"
Doris Liu [Thu, 7 Dec 2017 21:11:49 +0000 (21:11 +0000)]
Merge "Private API to turn off anti-aliasing for VectorDrawable"

6 years agoMerge "Further improvements when app forges package info for autofill:"
TreeHugger Robot [Thu, 7 Dec 2017 21:05:59 +0000 (21:05 +0000)]
Merge "Further improvements when app forges package info for autofill:"

6 years agoMerge "Remove VR handling for night display"
Christine Franks [Thu, 7 Dec 2017 20:55:20 +0000 (20:55 +0000)]
Merge "Remove VR handling for night display"

6 years agoMerge "Display Cutout: Dispatch Cutout from WindowManager"
TreeHugger Robot [Thu, 7 Dec 2017 20:36:13 +0000 (20:36 +0000)]
Merge "Display Cutout: Dispatch Cutout from WindowManager"

6 years agoMerge "Add transaction executor"
Andrii Kulian [Thu, 7 Dec 2017 20:31:45 +0000 (20:31 +0000)]
Merge "Add transaction executor"

6 years agoMerge "Track PSS in loadtest."
Stefan Lafon [Thu, 7 Dec 2017 20:23:37 +0000 (20:23 +0000)]
Merge "Track PSS in loadtest."

6 years agoMerge "Handle onBindingDied in notification manager"
TreeHugger Robot [Thu, 7 Dec 2017 20:18:54 +0000 (20:18 +0000)]
Merge "Handle onBindingDied in notification manager"

6 years agoMerge "Fix cyclic keyguard state notification"
Daniel Chapin [Thu, 7 Dec 2017 20:16:03 +0000 (20:16 +0000)]
Merge "Fix cyclic keyguard state notification"

6 years agoMerge "Attribution proto in atoms."
TreeHugger Robot [Thu, 7 Dec 2017 20:12:09 +0000 (20:12 +0000)]
Merge "Attribution proto in atoms."

6 years agoMerge "Moved data connection response into system api."
Jack Yu [Thu, 7 Dec 2017 19:01:29 +0000 (19:01 +0000)]
Merge "Moved data connection response into system api."

6 years agoMerge "Update VectorDrawables to use Skia's drawArc implementation."
TreeHugger Robot [Thu, 7 Dec 2017 18:57:13 +0000 (18:57 +0000)]
Merge "Update VectorDrawables to use Skia's drawArc implementation."

6 years agoDisplay Cutout: Dispatch Cutout from WindowManager
Adrian Roos [Tue, 7 Nov 2017 16:36:10 +0000 (17:36 +0100)]
Display Cutout: Dispatch Cutout from WindowManager

Adds the logic to dispatch a DisplayCutout from DisplayFrames
through WindowState to the View hierarchy. Does however not yet
change how windows are laid out in response to a DisplayCutout.

The display cutout is currently never present, the following CL
will add logic to emulate a display cutout on devices that do
not have a physical one.

Bug: 65689439
Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/wm/WindowFrameTests.java
Change-Id: Ie4cd4b575755b66a7ffead31e28640983ef4894e

6 years agoMerge "Update instant app notification icon."
Jon Boekenoogen [Thu, 7 Dec 2017 18:43:13 +0000 (18:43 +0000)]
Merge "Update instant app notification icon."

6 years agoExtend TaskStackListener wrapper to support more methods
Mike Digman [Sat, 2 Dec 2017 01:18:44 +0000 (17:18 -0800)]
Extend TaskStackListener wrapper to support more methods

Methods needed to know when to hide rotation suggestions
Test: manual

Change-Id: Iaf9ba582d0783ecc62e69641eff3dbc037b6689a

6 years agoAttribution proto in atoms.
Yangster-mac [Wed, 6 Dec 2017 21:42:38 +0000 (13:42 -0800)]
Attribution proto in atoms.

Test: statsd unit tests passed.

Change-Id: I3562319708376ea9d9a14e08382e57590eee7bf1

6 years agoMerge "DevicePolicyManager: Add key generation functionality."
TreeHugger Robot [Thu, 7 Dec 2017 18:20:45 +0000 (18:20 +0000)]
Merge "DevicePolicyManager: Add key generation functionality."

6 years agoTrack PSS in loadtest.
Stefan Lafon [Wed, 6 Dec 2017 23:54:41 +0000 (15:54 -0800)]
Track PSS in loadtest.

Test: Ran the loadtest. Not changing statsd.

Change-Id: Idc43cba59ec2c9d4213e20b395a083fdda58e8c4

6 years agoMerge "Rename EventConditionLink as MetricConditionLink in statsd_config.proto."
Stefan Lafon [Thu, 7 Dec 2017 17:58:57 +0000 (17:58 +0000)]
Merge "Rename EventConditionLink as MetricConditionLink in statsd_config.proto."

6 years agoFix cyclic keyguard state notification
Lucas Dupin [Thu, 7 Dec 2017 17:46:49 +0000 (09:46 -0800)]
Fix cyclic keyguard state notification

We should not not notify that the keyguard faded away
when a transition is cancelled. Another transition is
already happening and the message will be receive when
it finishes.

Change-Id: I4d2e227027a02f2168578bc1d201a4cf8672097d
Fixes: 70316977
Test: Double tap power button on the lock screen and aod
Test: Unlock with fingerprint from aod and lock screen
Test: Unlock with PIN
Test: Unlock from "pulsing" (AoD2) with fp or by tapping notification

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 agoDevicePolicyManager: Add key generation functionality.
Eran Messeri [Wed, 15 Nov 2017 05:55:52 +0000 (05:55 +0000)]
DevicePolicyManager: Add key generation functionality.

This is the crux of the Verified Access feature implementation:
Adding the ability to generate KeyChain keys directly by the
secure hardware, rather than installing software-generated keys
into KeyChain.

Add generateKeyPair to the DevicePolicyManager, which delegates key
generation (via the DevicePolicyManagerService) to the KeyChainService.

Design highlights:
* The key generation is delegated via the DevicePolicyManagerService to
  check that only authorized callers request key generation in KeyChain.
* KeyChainService performs the actual key generation so it owns the key
  in Keystore outright.
* DevicePolicyManagerService then grants the calling app access to the
  Keystore key, so it can actually be used.
* Loading the public/private key pair, as well as attestation
  certificate chain, is done in the client code (DevicePolicyManager)
  to save parceling / unparceling those objects across process
  boundaries twice (for no good reason).

NOTE: The key attestation functionality (that includes Device ID) is
missing/untested. Will be added in a follow-up CL as this one is quite
big already.

HIGHLIGHT FOR REVIEWERS:
* API: New API in DevicePolicyManager.

Bug: 63388672
Test: cts-tradefed run commandAndExit cts-dev -a armeabi-v7a -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testKeyManagement -l DEBUG; adb shell am instrument 'android.security.tests/android.support.test.runner.AndroidJUnitRunner' (After building the KeystoreTests target and installing the apk)
Change-Id: I73762c9123f32a94d454ba4f8b533883b55c44cc

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 agoMoved data connection response into system api.
Jack Yu [Thu, 30 Nov 2017 22:03:58 +0000 (14:03 -0800)]
Moved data connection response into system api.

This is a preliminary step for IWLAN refactoring, where data response
will be one of the parameter in data service callback.

Test: Telephony sanity tests
bug: 64132030
Change-Id: I7eb5318cd75ca3b7a29d5bf0da18d6b29a228ee1

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 agoFurther improvements when app forges package info for autofill:
Felipe Leme [Wed, 6 Dec 2017 20:09:37 +0000 (12:09 -0800)]
Further improvements when app forges package info for autofill:

- Dont create a session if the component is not owned by the calling UID.
- Log metrics for forged attempts.
- Avoid possible NPEs on AutofillManager when context or client is null.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.VirtualContainerActivityTest#testAppCannotFakePackageName
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Bug: 69981710

Change-Id: I9695bc046f3eb8aeecfe44f80fd0366f68b2c635

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 agoHandle onBindingDied in notification manager
Ryan Lothian [Mon, 4 Dec 2017 16:56:58 +0000 (11:56 -0500)]
Handle onBindingDied in notification manager

On Android, if the process containing the service being bound to
crashes before the bind succeeds, the app doing the binding won't
get a success or failure callback.

When that happens in this code, this leaves notif. manager thinking
that a binding is in progress, so it never attempts to rebind until
the device is rebooted.

Bug: 69064494
Test: manual, crashed listener on proc start, verified not unbound forever
Change-Id: Id2082744208e21a709d9453365f282449a2e9407

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