OSDN Git Service
Neil Fuller [Fri, 8 Dec 2017 01:49:33 +0000 (01:49 +0000)]
Merge "Fix doc typo. Improve class javadoc..." am:
e08f918a6e am:
26d28ef826
am:
ac8f2c94fd
Change-Id: I3a587c589237460122cd2aacaed20c462e303db9
Bowgo Tsai [Fri, 8 Dec 2017 01:43:30 +0000 (01:43 +0000)]
Merge "Disable AVB check in runtime vintf" am:
86c9951383 am:
a241b4d488
am:
3a315ab982 -s ours
Change-Id: Id2f35f823206c2d96faceed179bc842ec4d5275a
Tarandeep Singh [Fri, 8 Dec 2017 00:57:20 +0000 (00:57 +0000)]
Merge "Add support for VR InputMethod."
Tarandeep Singh [Tue, 21 Nov 2017 22:26:11 +0000 (14:26 -0800)]
Add support for VR InputMethod.
This change adds support for VR-only IMEs in InputMethod framework.
In order to set this VR IME, setVrInputMethod(ComponentName) should be
called by VrManager.
When VrManager calls setVrInputMethod(), IMMS changes updates
the selected input method in a transient way i.e. it doesn't
update the Settings or input history. Once VR mode finishes,
it restores last input from settings.
Bug:
63037786
Test: Manually using the sample app in bug.
Change-Id: I1db7981b5198e7e203d4578cae7e5b6d20037d0d
Android Build Merger (Role) [Fri, 8 Dec 2017 00:53:19 +0000 (00:53 +0000)]
Merge "Merge "Revert "Add odm sepolicy support to SELinuxMMAC.java"" am:
0e8440632a am:
6c7981ebf2 am:
383668cab4"
TreeHugger Robot [Fri, 8 Dec 2017 00:51:00 +0000 (00:51 +0000)]
Merge "Fix NPE on logContextCommitted()"
Bo Hu [Fri, 8 Dec 2017 00:49:55 +0000 (00:49 +0000)]
Merge "Revert "Add odm sepolicy support to SELinuxMMAC.java"" am:
0e8440632a am:
6c7981ebf2
am:
383668cab4
Change-Id: I29295e346df79fec7324dd542ff3a4638c172978
TreeHugger Robot [Fri, 8 Dec 2017 00:48:09 +0000 (00:48 +0000)]
Merge "Fix ConcurrentModificationException in DashboardCategory."
TreeHugger Robot [Fri, 8 Dec 2017 00:44:48 +0000 (00:44 +0000)]
Merge "camera: Update AF scene change key"
Xin Li [Fri, 8 Dec 2017 00:40:44 +0000 (00:40 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am:
d18ed49f9d -s ours am:
3aafa4c9ce
am:
9c8ee081e1 -s ours
Change-Id: Iba7fa3c7c0a70e34f97b408fe5b58187b1e433ac
TreeHugger Robot [Fri, 8 Dec 2017 00:32:54 +0000 (00:32 +0000)]
Merge "Move codes generating html file from xml files to SettingsLib (2/2)"
Etan Cohen [Fri, 8 Dec 2017 00:31:15 +0000 (00:31 +0000)]
Merge "[RTT2] Convert APIs to use MacAddress"
Maggie Wang [Fri, 8 Dec 2017 00:00:14 +0000 (00:00 +0000)]
Merge "Send MODE_CHANGING broadcast before location mode change."
Stephen Li [Thu, 7 Dec 2017 23:48:48 +0000 (23:48 +0000)]
Manually merge changes from giant AOSP topic
Change-Id: I4cfb7d659fd404b4e0a3c4809eacf200fc452df4
TreeHugger Robot [Thu, 7 Dec 2017 23:44:24 +0000 (23:44 +0000)]
Merge "Make TextClock only listen for specific changes."
TreeHugger Robot [Thu, 7 Dec 2017 23:24:02 +0000 (23:24 +0000)]
Merge "Improved opening performance"
Maggie [Tue, 21 Nov 2017 19:57:30 +0000 (11:57 -0800)]
Send MODE_CHANGING broadcast before location mode change.
When location mode is about to change in Settings app, send
MODE_CHANGING broadcast.
Fixes:
28057031
Test: manual
Test: robotests
Change-Id: Id26325520211a8934c1670dfcd12e8d339766308
Eric Erfanian [Thu, 7 Dec 2017 23:20:07 +0000 (23:20 +0000)]
Merge "Add assisted dialing properties to the framework."
TreeHugger Robot [Thu, 7 Dec 2017 23:04:47 +0000 (23:04 +0000)]
Merge "Rename "Go to web" -> "Go to browser""
Chien-Yu Chen [Thu, 7 Dec 2017 22:45:50 +0000 (14:45 -0800)]
camera: Update AF scene change key
Update the generated docs.
Test: make
Bug:
64847201
Change-Id: I4737a982afa3b237feaf84ec777716066c870ce0
Felipe Leme [Thu, 7 Dec 2017 22:31:44 +0000 (14:31 -0800)]
Fix NPE on logContextCommitted()
Test: atest CtsAutoFillServiceTestCases:FillEventHistoryTest
Bug:
68045531
Change-Id: Ieaf9f615ed3a203939713e48db808ff0d00ed059
Mike Digman [Thu, 7 Dec 2017 21:53:13 +0000 (21:53 +0000)]
Merge "Extend RotationPolicy to lock the screen at a specific rotation"
Mike Digman [Thu, 7 Dec 2017 21:50:23 +0000 (21:50 +0000)]
Merge "Extend TaskStackListener wrapper to support more methods"
Geoffrey Pitsch [Thu, 7 Dec 2017 21:32:29 +0000 (21:32 +0000)]
Merge "New supported QuickViewConstant feature to delete a file."
Doris Liu [Thu, 7 Dec 2017 21:11:49 +0000 (21:11 +0000)]
Merge "Private API to turn off anti-aliasing for VectorDrawable"
TreeHugger Robot [Thu, 7 Dec 2017 21:05:59 +0000 (21:05 +0000)]
Merge "Further improvements when app forges package info for autofill:"
Christine Franks [Thu, 7 Dec 2017 20:55:20 +0000 (20:55 +0000)]
Merge "Remove VR handling for night display"
Doris Ling [Mon, 4 Dec 2017 19:12:26 +0000 (11:12 -0800)]
Fix ConcurrentModificationException in DashboardCategory.
- When getting the copy of dashboard tiles, create a new list instead of
getting the unmodifiable list, as the underlying implementation of the
unmodifiable list actually access the original list directly.
This getTiles() method is meant to return a copy of the list of tiles
to avoid concurrent access to the original list, so, it needs a copy
instead of a direct reference to the original list.
- synchrnoized all updater methods in DashboardCategory
Change-Id: I696b669f39fea5019a3b12ca73da47a7c11b03fb
Fixes:
69677575
Test: make RunSettingsLibRoboTests
Jon Boekenoogen [Thu, 30 Nov 2017 18:16:12 +0000 (10:16 -0800)]
Rename "Go to web" -> "Go to browser"
Update text based on PM guidance.
Screenshot:
https://screenshot.googleplex.com/zmN3oFSLNkj (before)
https://screenshot.googleplex.com/wdtT9qN0h5q (after)
Test: Screenshot from marlin above.
Bug:
68952332
Change-Id: I436fbf5801306776c7052146da451dfb601fd7c0
TreeHugger Robot [Thu, 7 Dec 2017 20:36:13 +0000 (20:36 +0000)]
Merge "Display Cutout: Dispatch Cutout from WindowManager"
Andrii Kulian [Thu, 7 Dec 2017 20:31:45 +0000 (20:31 +0000)]
Merge "Add transaction executor"
Stefan Lafon [Thu, 7 Dec 2017 20:23:37 +0000 (20:23 +0000)]
Merge "Track PSS in loadtest."
TreeHugger Robot [Thu, 7 Dec 2017 20:18:54 +0000 (20:18 +0000)]
Merge "Handle onBindingDied in notification manager"
Daniel Chapin [Thu, 7 Dec 2017 20:16:03 +0000 (20:16 +0000)]
Merge "Fix cyclic keyguard state notification"
TreeHugger Robot [Thu, 7 Dec 2017 20:12:09 +0000 (20:12 +0000)]
Merge "Attribution proto in atoms."
Jack Yu [Thu, 7 Dec 2017 19:01:29 +0000 (19:01 +0000)]
Merge "Moved data connection response into system api."
TreeHugger Robot [Thu, 7 Dec 2017 18:57:13 +0000 (18:57 +0000)]
Merge "Update VectorDrawables to use Skia's drawArc implementation."
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
Jon Boekenoogen [Thu, 7 Dec 2017 18:43:13 +0000 (18:43 +0000)]
Merge "Update instant app notification icon."
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
Eric Erfanian [Thu, 7 Dec 2017 00:27:53 +0000 (16:27 -0800)]
Add assisted dialing properties to the framework.
This is a manual merge of the oc-mr1-dev change
I086e761ada9a57dca61c3a412561ee54255d6260
These properties allow the feature to be propogated from
the outgoing call broadcast, to the connection, to the call,
and finally to the call log as a feature.
Test: no existing unit tests found. could use some pointers
Bug:
35963245
Change-Id: I84343fb0cda16514c01997fd71d1e819b5b7eebb
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
Selim Cinek [Mon, 4 Dec 2017 16:41:27 +0000 (17:41 +0100)]
Improved opening performance
This should improve the opening and closing jank by
reducing binder calls and optimizing certain java
bottlenecks
Change-Id: I9a7831b4684954db4aa30dd5f3588967eca72741
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
Test: run janktests
Fixes:
69933777
TreeHugger Robot [Thu, 7 Dec 2017 18:20:45 +0000 (18:20 +0000)]
Merge "DevicePolicyManager: Add key generation functionality."
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
Stefan Lafon [Thu, 7 Dec 2017 17:58:57 +0000 (17:58 +0000)]
Merge "Rename EventConditionLink as MetricConditionLink in statsd_config.proto."
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
TreeHugger Robot [Thu, 7 Dec 2017 17:35:23 +0000 (17:35 +0000)]
Merge "Moar changes for Autofill Field Classification mechanism:"
TreeHugger Robot [Thu, 7 Dec 2017 17:23:50 +0000 (17:23 +0000)]
Merge "There is only one Generic.kl."
TreeHugger Robot [Thu, 7 Dec 2017 17:19:27 +0000 (17:19 +0000)]
Merge "Flatten dependency hierarchy of legacy-android-test"
George Mount [Thu, 7 Dec 2017 15:34:07 +0000 (07:34 -0800)]
Make TextClock only listen for specific changes.
Bug
68016230
Make TextClock only listen for changes to the 12/24
hour clock setting, so that it doesn't trigger a
change when other settings are updated.
Test: I5dee1694890ec90b0eabb939cd636971ed9ba5d4
Change-Id: Ia345995dc2f019209e3c68e6e8681cd2c9d5f439
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
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
Etan Cohen [Tue, 21 Nov 2017 20:02:22 +0000 (12:02 -0800)]
[RTT2] Convert APIs to use MacAddress
MacAddress class is being added as a public API. Convert ad-hoc
byte[] represetations to new class.
Bug:
65108607
Test: unit tests and integration tests
Change-Id: I4bf3b7c47f37d4ef4dd5af0dcdeb7d57f2f94368
Neil Fuller [Thu, 7 Dec 2017 14:28:32 +0000 (14:28 +0000)]
Merge "Fix doc typo. Improve class javadoc..." am:
e08f918a6e
am:
26d28ef826
Change-Id: I7db3a33c933142806cbae90423044ccbac061868
Neil Fuller [Thu, 7 Dec 2017 13:54:16 +0000 (13:54 +0000)]
Merge "Fix doc typo. Improve class javadoc..."
am:
e08f918a6e
Change-Id: I2e933a55ce3b239ad9a2afee964d288dcbd04a11
Bernardo Rufino [Thu, 7 Dec 2017 11:15:29 +0000 (11:15 +0000)]
Merge "Binding on-demand #4: PerformClearTask usage"
Neil Fuller [Thu, 7 Dec 2017 11:02:52 +0000 (11:02 +0000)]
Merge "Fix doc typo. Improve class javadoc..."
Bowgo Tsai [Thu, 7 Dec 2017 10:19:47 +0000 (10:19 +0000)]
Merge "Disable AVB check in runtime vintf" am:
86c9951383
am:
a241b4d488
Change-Id: Icf111bfeedde4a134ac77af935afff096961a852
Bowgo Tsai [Thu, 7 Dec 2017 10:08:27 +0000 (10:08 +0000)]
Merge "Disable AVB check in runtime vintf"
am:
86c9951383
Change-Id: I70295f5685d18bed99822f4e712edfb6c2a1b280
Bo Hu [Thu, 7 Dec 2017 08:42:27 +0000 (08:42 +0000)]
Merge "Revert "Add odm sepolicy support to SELinuxMMAC.java"" am:
0e8440632a
am:
6c7981ebf2
Change-Id: I3033faed5edf11c2e918c23028031132dc24cff0
Xin Li [Thu, 7 Dec 2017 08:34:18 +0000 (08:34 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am:
d18ed49f9d -s ours
am:
3aafa4c9ce
Change-Id: I0e586f759df230aeff2dd045e5ff1d138d284ec3
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
Treehugger Robot [Thu, 7 Dec 2017 08:15:35 +0000 (08:15 +0000)]
Merge "Disable AVB check in runtime vintf"
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
Xin Li [Thu, 7 Dec 2017 06:33:50 +0000 (06:33 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master am:
5364be50cd -s ours
am:
10a3719386
Change-Id: I5cf1244ca19edc85e07ff8e4b63e0a04f50132b6
Bo Hu [Thu, 7 Dec 2017 06:31:36 +0000 (06:31 +0000)]
Merge "Revert "Add odm sepolicy support to SELinuxMMAC.java""
am:
0e8440632a
Change-Id: I041cd82448479a2d1f67d1cc5ef854272348591f
Xin Li [Thu, 7 Dec 2017 06:23:41 +0000 (06:23 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am:
d18ed49f9d -s ours
Change-Id: I8a40fa162f8acfcc5f681a1419a903d27b18906c
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
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
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"
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
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"
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
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"
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
TreeHugger Robot [Thu, 7 Dec 2017 05:04:21 +0000 (05:04 +0000)]
Merge "Removed vibrations when icons go into / out of the shelf"
TreeHugger Robot [Thu, 7 Dec 2017 04:40:46 +0000 (04:40 +0000)]
Merge "Allow subclass of TaskRecord."
Xin Li [Thu, 7 Dec 2017 04:09:52 +0000 (04:09 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master
am:
5364be50cd -s ours
Change-Id: Ia39fa85435347c780403bf111f186a6a00f76d86
Treehugger Robot [Thu, 7 Dec 2017 04:02:29 +0000 (04:02 +0000)]
Merge "Revert "Add odm sepolicy support to SELinuxMMAC.java""
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
Jeff Sharkey [Thu, 7 Dec 2017 03:10:06 +0000 (03:10 +0000)]
Merge "Guide user towards adoption when card is "empty"."
TreeHugger Robot [Thu, 7 Dec 2017 01:51:58 +0000 (01:51 +0000)]
Merge "Fix a deadlock in statsd."
TreeHugger Robot [Thu, 7 Dec 2017 01:16:28 +0000 (01:16 +0000)]
Merge "Move notification service tests to be ui services tests"
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
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
Jaekyun Seok [Fri, 1 Dec 2017 01:37:10 +0000 (10:37 +0900)]
Move codes generating html file from xml files to SettingsLib (2/2)
LicenseHtmlGeneratorFromXml, LicenseHtmlLoader and indirecly AsyncLoader
shoud be commonly used by Settings and TvSettings.
So this CL will move them to SettingsLib.
Bug:
37763148
Test: building succeeded and tested on sailfish
make ROBOTEST_FILTER=LicenseHtmlGeneratorFromXmlTest RunSettingsLibRoboTests
make ROBOTEST_FILTER=LicenseHtmlLoaderTest RunSettingsLibRoboTests
Change-Id: I86b59d82c46b6c5f520a6be260363f1b6ffd43f4
TreeHugger Robot [Thu, 7 Dec 2017 00:52:53 +0000 (00:52 +0000)]
Merge "Convert services/core/jni to Android.bp"
TreeHugger Robot [Thu, 7 Dec 2017 00:40:47 +0000 (00:40 +0000)]
Merge "Use prebuilt android.test.base.jar for app builds"
Makoto Onuki [Thu, 7 Dec 2017 00:18:56 +0000 (00:18 +0000)]
Merge "Extreme battery saver: Allow lowering framerate for experiments."
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
Change-Id: I186f7bc68a76d7b2d717875791ee2fe1828c3598
TreeHugger Robot [Thu, 7 Dec 2017 00:14:12 +0000 (00:14 +0000)]
Merge "Saving USB Device connect/disconnect info."
TreeHugger Robot [Thu, 7 Dec 2017 00:10:05 +0000 (00:10 +0000)]
Merge "Prefer std::string over String8"
TreeHugger Robot [Wed, 6 Dec 2017 23:58:44 +0000 (23:58 +0000)]
Merge "Fix issue where scrims would not go away"
Yao Chen [Wed, 6 Dec 2017 23:35:50 +0000 (15:35 -0800)]
Fix a deadlock in statsd.
Test: manual
Change-Id: I7676713f604699737d819ac67fe49bc5b5d8cf98
Xin Li [Wed, 6 Dec 2017 23:18:26 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
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.
TreeHugger Robot [Wed, 6 Dec 2017 22:56:17 +0000 (22:56 +0000)]
Merge "Introduce getProfileSwitchingIcon/Label In CrossProfileApps"
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
TreeHugger Robot [Wed, 6 Dec 2017 22:33:41 +0000 (22:33 +0000)]
Merge "Fix CTS tests failing due to job throttling"