OSDN Git Service
Bill Yi [Thu, 30 Nov 2017 21:23:22 +0000 (21:23 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
18fd5109c9 -s ours
am:
68a3e65ecd -s ours
Change-Id: I10fac2255546543b6d52c3953dd3c0070a3544f4
Bill Yi [Thu, 30 Nov 2017 21:10:57 +0000 (21:10 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
18fd5109c9 -s ours
Change-Id: I66a71face01ca5e2e3fa1ee720cf85b68af6d6aa
TreeHugger Robot [Thu, 30 Nov 2017 21:01:00 +0000 (21:01 +0000)]
Merge "AAPT2: Specify the output APK in log messages"
TreeHugger Robot [Thu, 30 Nov 2017 20:52:04 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 20:35:03 +0000 (20:35 +0000)]
Merge "Fix package install flow w.r.t. dexopt"
TreeHugger Robot [Thu, 30 Nov 2017 20:26:49 +0000 (20:26 +0000)]
Merge "Allow secondary user POs on affiliated devices more DPM APIs"
TreeHugger Robot [Thu, 30 Nov 2017 20:00:13 +0000 (20:00 +0000)]
Merge "Propagate scrim alpha to LightBarController"
TreeHugger Robot [Thu, 30 Nov 2017 19:58:15 +0000 (19:58 +0000)]
Merge "incidentd: dumping native process mem info to proto."
Kweku Adams [Fri, 3 Nov 2017 00:12:20 +0000 (17:12 -0700)]
incidentd: dumping native process mem info to proto.
Bug:
65750823
Test: flash device and check proto dump output.
Change-Id: Ic584f78153fbbb507cdd41e699a541e3351467bb
TreeHugger Robot [Thu, 30 Nov 2017 19:47:56 +0000 (19:47 +0000)]
Merge "Adding pointer index check to recents touch handler."
Kevin Hufnagle [Thu, 30 Nov 2017 19:35:53 +0000 (19:35 +0000)]
cherry-pick from oc-dev: docs: Note regarding device IDs, Build.java am:
d6ebb55c62
am:
fcd96e847f
Change-Id: I51b08b72f22f30a1e825a2192bc0f09f7d8f92f7
TreeHugger Robot [Thu, 30 Nov 2017 19:31:21 +0000 (19:31 +0000)]
Merge "PaintMeasureTextTest: only pause/resume not_cached benchmarks"
Kevin Hufnagle [Thu, 30 Nov 2017 19:24:10 +0000 (19:24 +0000)]
cherry-pick from oc-dev: docs: Note regarding device IDs, Build.java
am:
d6ebb55c62
Change-Id: I88bf4c778a04b5f43a7fcd22d4aadb378860bb8a
Shane Farmer [Thu, 30 Nov 2017 00:55:05 +0000 (16:55 -0800)]
AAPT2: Specify the output APK in log messages
Extend the context wrapper to allow it to also know the current artifact
that is being generated and to use that as a source for diagnostics
messages.
Test: ran unit tests
Test: manually ran optimize to split and APK and verified log messages
Change-Id: I1d66dacb38db58d57d2fffaa19f5fdaff9f908df
TreeHugger Robot [Thu, 30 Nov 2017 18:22:42 +0000 (18:22 +0000)]
Merge "Switch usages of legacy-test to android.test.base"
TreeHugger Robot [Thu, 30 Nov 2017 18:17:55 +0000 (18:17 +0000)]
Merge "Make native AudioRouting Handler in a seperate class."
Lucas Dupin [Thu, 30 Nov 2017 18:09:22 +0000 (13:09 -0500)]
Propagate scrim alpha to LightBarController
Change-Id: I8f89c0ccb5811ce729f04041dc1ff8efa3877991
Fixes:
69895859
Test: Launch settings, chrome, go back to launcher
Benjamin Franz [Tue, 8 Aug 2017 11:33:19 +0000 (12:33 +0100)]
Allow secondary user POs on affiliated devices more DPM APIs
- DevicePolicyManager.setKeyguardDisabled
- DevicePolicyManager.setStatusBarDisabled
- DevicePolicyManager.setDeviceOwnerLockScreenInfo
- PackageInstaller install and uninstall apps
Bug:
64383519
Test: Can set keyguard disabled, status bar disabled and lock screen message in
affliated PO
Test: Can install and uninstall apps in affiliated PO
Test: CTS tracked in b/
68925683
Change-Id: I71be25098436ba0b42050478c049850c2b21f6f4
Greg Hackmann [Wed, 29 Nov 2017 02:35:46 +0000 (18:35 -0800)]
PaintMeasureTextTest: only pause/resume not_cached benchmarks
Pausing and resuming the benchmark timer isn't needed unless we plan to
flush the text layout cache. The cached benchmark runs are so fast on
high-end devices, the overhead of these extra calls can be significant
compared to the actual code being measured.
Test: run PaintMeasureTextTest on sailfish
Bug:
69634871
Change-Id: If8246154e50451d82ac96e026036aa4a42eaed8d
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Mohamed [Thu, 30 Nov 2017 16:34:15 +0000 (16:34 +0000)]
Merge "Add SMS over IMS APIs" am:
74445ed311 am:
208f232825
am:
09d8a996e0
Change-Id: I0c49f42e220aed34c6bb4801ae80e29aeea329eb
Nadav Bar [Thu, 30 Nov 2017 16:28:17 +0000 (16:28 +0000)]
Merge "Enabled the use of VOICE_DOWNLINK, VOICE_UPLINK and VOICE_CALL as audio sources for AudioRecord (Only supported for system apps)"
Christine Franks [Thu, 30 Nov 2017 16:23:46 +0000 (16:23 +0000)]
Merge "Promote ACTION_DISMISS_TIMER to public API"
Paul Duffin [Thu, 30 Nov 2017 16:17:16 +0000 (16:17 +0000)]
Switch usages of legacy-test to android.test.base
The legacy-test library has been deprecated in favour of the
android.test.base library which is part of the SDK.
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.
* core/tests/overlaytests/OverlayAppFiltered/Android.mk
Removed legacy-test from LOCAL_JAVA_LIBRARIES because the source
for module 'com.android.overlaytest.filtered_app_overlay' does not
depend on classes from legacy-test
* core/tests/overlaytests/OverlayAppFirst/Android.mk
Removed legacy-test from LOCAL_JAVA_LIBRARIES because the source
for module 'com.android.overlaytest.first_app_overlay' does not
depend on classes from legacy-test
* core/tests/overlaytests/OverlayAppSecond/Android.mk
Removed legacy-test from LOCAL_JAVA_LIBRARIES because the source
for module 'com.android.overlaytest.second_app_overlay' does not
depend on classes from legacy-test
* core/tests/overlaytests/OverlayTest/Android.mk
Replaced 'legacy-test' with 'android.test.base' in
LOCAL_JAVA_LIBRARIES because the source for module 'OverlayTest'
depends on classes from android.test.base
* core/tests/overlaytests/OverlayTestOverlay/Android.mk
Removed legacy-test from LOCAL_JAVA_LIBRARIES because the source
for module 'com.android.overlaytest.overlay' does not depend on
classes from legacy-test
* test-mock/Android.mk
Removed legacy-test from LOCAL_JAVA_LIBRARIES because the source
for module 'repackaged.android.test.mock' does not depend on
classes from legacy-test
Bug:
30188076
Test: make checkbuild
Change-Id: I729412304884cf5da88b05dbe8fbe645ad7b5b15
Mohamed [Thu, 30 Nov 2017 16:15:58 +0000 (16:15 +0000)]
Merge "Add SMS over IMS APIs" am:
74445ed311
am:
208f232825
Change-Id: If9b5427292eaa41b6381351c57ec5cad4b6bc4a1
Mohamed [Thu, 30 Nov 2017 16:05:36 +0000 (16:05 +0000)]
Merge "Add SMS over IMS APIs"
am:
74445ed311
Change-Id: I5b08b82f39968adc111d0b3361b4312eb7244913
Treehugger Robot [Thu, 30 Nov 2017 15:56:30 +0000 (15:56 +0000)]
Merge "Add SMS over IMS APIs"
TreeHugger Robot [Thu, 30 Nov 2017 15:03:50 +0000 (15:03 +0000)]
Merge "Remove unused repackaged-legacy-test target"
Bill Yi [Thu, 30 Nov 2017 10:51:39 +0000 (02:51 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
69925163
Change-Id: Id4714728cce7cdc505ef573f61b0807eaf99f638
Lenka Trochtova [Mon, 16 Oct 2017 16:41:39 +0000 (18:41 +0200)]
Make DevicePolicyManagerService more customizable (per-device).
Add a config to override the DPMS implementation class to
be instantiated from the Lifecycle.
Add a hasFeature method to the Injector class.
BUG:
63753860
Test: manual with TestDPC
Change-Id: I71ef518c49b2233744defdfb7c31019cb228d678
Chenjie Yu [Tue, 21 Nov 2017 18:21:41 +0000 (10:21 -0800)]
add atoms and pulling methods for wifi controller activity and modem
controller activity
Test: manual test on device
Change-Id: Ib4213b4bf8badaf22b5f655e0261f45a55ab6bb7
TreeHugger Robot [Thu, 30 Nov 2017 06:35:29 +0000 (06:35 +0000)]
Merge "Add a phony target containing benchmarks for PGO"
TreeHugger Robot [Thu, 30 Nov 2017 05:59:39 +0000 (05:59 +0000)]
Merge "Modify statsd dogfood app to use toString() of enum"
Tej Singh [Thu, 30 Nov 2017 03:25:32 +0000 (19:25 -0800)]
Modify statsd dogfood app to use toString() of enum
Using this reduces code size and allows us to not have to
make a change whenever atoms.proto changes.
Test: manual, tested app on device
Change-Id: Ieb325a7a7bab7430273340bb9d05974fabbadc0d
TreeHugger Robot [Thu, 30 Nov 2017 03:21:06 +0000 (03:21 +0000)]
Merge "Fix cross-user content resolver tests."
Calin Juravle [Thu, 16 Nov 2017 00:28:01 +0000 (16:28 -0800)]
Fix package install flow w.r.t. dexopt
Calling dexopt before the applicationInfo gets the uid is wrong.
Dexopt needs to be able to set the GID of the odex file to the
UserHandle.getSharedAppGid(pkg.applicationInfo.uid) and that is
possible only with a valid uid.
Move the dexopt logic after installNewPackageLIF/replacePackageLIF
to ensure that we get a valid uid.
Bug:
69331247
Test: adb install & check the GID of the compiler artifacts
Change-Id: I2434a1a0b9015091a9af2009b3f785b7a16e1256
Chih-hung Hsieh [Thu, 30 Nov 2017 02:58:20 +0000 (02:58 +0000)]
Merge "Use -Werror in frameworks/base/media/mca/filterfw" am:
171fce8377 am:
cba4979a6a
am:
f5005c6356
Change-Id: Icb467de821ecd700daae687341dc9116c065cdf5
TreeHugger Robot [Thu, 30 Nov 2017 02:51:46 +0000 (02:51 +0000)]
Merge "AAPT2: Fix overzealous AndroidManifest fully qualified class names"
Chih-hung Hsieh [Thu, 30 Nov 2017 02:27:13 +0000 (02:27 +0000)]
Merge "Use -Werror in frameworks/base/media/mca/filterfw" am:
171fce8377
am:
cba4979a6a
Change-Id: Ifea0bcb3e48a83ba21c24026d95819f4f947d039
TreeHugger Robot [Thu, 30 Nov 2017 02:19:22 +0000 (02:19 +0000)]
Merge "Add metric for battery page in debug mode."
Chih-hung Hsieh [Thu, 30 Nov 2017 02:19:13 +0000 (02:19 +0000)]
Merge "Use -Werror in frameworks/base/media/mca/filterfw"
am:
171fce8377
Change-Id: I698ee4b4d6c884469253238795d23bdb21a54542
TreeHugger Robot [Thu, 30 Nov 2017 02:16:23 +0000 (02:16 +0000)]
Merge "Use system dialog corner radius"
Wale Ogunwale [Thu, 30 Nov 2017 02:04:01 +0000 (02:04 +0000)]
Merge "Don't start recents multiple times when entering split-screen"
Chih-hung Hsieh [Thu, 30 Nov 2017 01:55:47 +0000 (01:55 +0000)]
Merge "Use -Werror in frameworks/base/media/mca/filterfw"
TreeHugger Robot [Thu, 30 Nov 2017 01:28:59 +0000 (01:28 +0000)]
Merge "ImageReader: Make discardFreeBuffers public"
Fyodor Kupolov [Thu, 30 Nov 2017 01:18:20 +0000 (01:18 +0000)]
Merge "Remove shutdown of StorageManager"
TreeHugger Robot [Thu, 30 Nov 2017 01:16:54 +0000 (01:16 +0000)]
Merge "Adds guardrail for memory usage for statsd uid map."
TreeHugger Robot [Thu, 30 Nov 2017 01:13:23 +0000 (01:13 +0000)]
Merge "Don't fail the tests if per-freq cpu times are not available."
TreeHugger Robot [Thu, 30 Nov 2017 01:07:29 +0000 (01:07 +0000)]
Merge "TextClassifier cleanup #1"
Dmitry Dementyev [Thu, 30 Nov 2017 01:05:42 +0000 (01:05 +0000)]
Merge "Make libkeystore_aidl shared and export to PDK."
TreeHugger Robot [Thu, 30 Nov 2017 00:57:07 +0000 (00:57 +0000)]
Merge "Update nav bar controller to allow for a home intent to be fired without having a package name."
Adam Lesinski [Thu, 30 Nov 2017 00:27:44 +0000 (16:27 -0800)]
AAPT2: Fix overzealous AndroidManifest fully qualified class names
ManifestFixer would go and fully qualify all elements with the attribute
'android:name', which is not correct, especially for cases like
<uses-split android:name="foo" />
Test: make aapt2_tests
Change-Id: I4bea2550d0025179d2d48dca8c64e0cbf4451e99
Pengquan Meng [Thu, 30 Nov 2017 00:26:13 +0000 (00:26 +0000)]
Merge "fixed CdmaSmsAddress parser" am:
b00f00e74b am:
c8ec8a5e56
am:
3ca2c2dab8
Change-Id: Ie28175cc6946f4e53069895c0ea9f28634b9a96f
Mohamed [Tue, 28 Nov 2017 02:40:09 +0000 (18:40 -0800)]
Add SMS over IMS APIs
- Adds public APIs that IMS providers will implement/use
- Adds aidl APIs for internal communications to support SMS over IMS.
- First pass at documentation of APIs.
Moving over from ag/
3265442
Bug:
69846044
Test: None
Change-Id: Ic665a2a7d64a56417bcf2a159d6b88b05cdb832a
Sudheer Shanka [Thu, 30 Nov 2017 00:12:14 +0000 (00:12 +0000)]
Merge "Temporarily disable the netpolicy unit tests."
TreeHugger Robot [Thu, 30 Nov 2017 00:11:00 +0000 (00:11 +0000)]
Merge changes Ie479be5b,I299245fc
* changes:
Fix if clauses
Update error text
Pengquan Meng [Thu, 30 Nov 2017 00:10:02 +0000 (00:10 +0000)]
Merge "fixed CdmaSmsAddress parser" am:
b00f00e74b
am:
c8ec8a5e56
Change-Id: Id3830aaea1037b61ecc385715708427c84030206
Pengquan Meng [Wed, 29 Nov 2017 23:52:41 +0000 (23:52 +0000)]
Merge "fixed CdmaSmsAddress parser"
am:
b00f00e74b
Change-Id: I041c8f3937882b7fd78adf2c2f2cf87fc225b936
TreeHugger Robot [Wed, 29 Nov 2017 23:51:38 +0000 (23:51 +0000)]
Merge "Fix horizontal position of tooltip in a Dialog"
Pengquan Meng [Wed, 29 Nov 2017 23:38:29 +0000 (23:38 +0000)]
Merge "fixed CdmaSmsAddress parser"
TreeHugger Robot [Wed, 29 Nov 2017 23:35:12 +0000 (23:35 +0000)]
Merge "Measure the text before doing line break"
Sudheer Shanka [Wed, 29 Nov 2017 23:20:45 +0000 (15:20 -0800)]
Fix cross-user content resolver tests.
Wait for the user to get unlocked before trying to start an
encryption-unaware app in that user.
Fixes:
69927817
Test: adb shell am instrument -e class android.content.ManagedUserContentResolverTest -w
com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I36f38d20c7f4584a68bc3b1b99941ce3e3b3815c
jiabin [Mon, 6 Nov 2017 23:36:27 +0000 (15:36 -0800)]
Make native AudioRouting Handler in a seperate class.
Bug:
64038649
Test: runtest --path cts/tests/tests/media/src/android/media/cts/RoutingTest.java
Change-Id: I2fc64e177797b2541ba8652d54827f08fd6ca216
Jiuyu Sun [Wed, 29 Nov 2017 23:12:08 +0000 (23:12 +0000)]
Merge "Confirmation code second try."
Lucas Dupin [Wed, 29 Nov 2017 23:04:53 +0000 (23:04 +0000)]
Merge "Make face unlock icon use correct theme attr"
Jeff Sharkey [Wed, 29 Nov 2017 23:01:50 +0000 (23:01 +0000)]
Merge "Add build targets to build @SystemApi diffs."
Winson Chung [Wed, 29 Nov 2017 22:36:12 +0000 (14:36 -0800)]
Adding pointer index check to recents touch handler.
- Also fix issue with wrong pointer index used to update last
position when pointer changes
Bug:
65030830
Test: Manual - multitouch in recents
Change-Id: I75249594f48619b123b79e0188a0dc05a52b5416
David Chen [Mon, 27 Nov 2017 19:52:26 +0000 (11:52 -0800)]
Adds guardrail for memory usage for statsd uid map.
Checks if current memory usage of uid map is above a configured limit
and if so, we start deleting snapshots. If there are no more
snapshots, we begin deleting two of the deltas. Also records stats
in the guardrail StatsdStats. Also fixes an edge case where a config
is added after the snapshots are added. We request a snapshot of all
installed uid's at that moment. Finally, adds the uid map memory size
when determining if we should send a broadcast to trigger collection.
Test: Added unit-tests and check they pass on marlin.
Change-Id: Id5d86378bd1efe12a06b409164c777c0c6f4e3ab
Brad Stenning [Wed, 29 Nov 2017 22:37:51 +0000 (14:37 -0800)]
Update nav bar controller to allow for a home intent to be fired without
having a package name.
Test: After set up select the Lenspicker as the home app then click the
home button (note: needs other commits with topic "AAE Home"
Change-Id: Ief9871bcc81902036d7af9630d6f1d27e8c83366
(cherry picked from commit Icddda312c10dfd603fb098fec13dae55d807444e)
# Conflicts:
# packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarController.java
Chih-Hung Hsieh [Wed, 29 Nov 2017 22:43:12 +0000 (14:43 -0800)]
Use -Werror in frameworks/base/media/mca/filterfw
Bug:
66996870
Test: build with WITH_TIDY=1
Change-Id: I12137a0b40357954af63bac3771332773b03da9a
TreeHugger Robot [Wed, 29 Nov 2017 22:41:19 +0000 (22:41 +0000)]
Merge "WebView: linkify ClientCertRequest method names"
Kevin Hufnagle [Tue, 16 May 2017 23:48:10 +0000 (16:48 -0700)]
cherry-pick from oc-dev: docs: Note regarding device IDs, Build.java
Added note within getSerial() in android.os.Build class. Device
identifiers, such as hardware serial numbers, can be modified if a
device is rooted. Others can use key attestation to discover these
changes. Added a note to this effect within this method.
Test: make ds-docs -j8
Bug:
38312326
Change-Id: I76e3f6a15b9a8673ca3304218653e8cd26da38d7
Original-Change-Id: Ibd2dab621c14683e12a213957b567ee49b8d00fd
Dmitry Dementyev [Tue, 28 Nov 2017 20:11:44 +0000 (12:11 -0800)]
Make libkeystore_aidl shared and export to PDK.
Bug:
69539820
Test: manual
Change-Id: Iff47e9247fbc2217a2c70a35bbc6c72075af63bb
TreeHugger Robot [Wed, 29 Nov 2017 22:19:07 +0000 (22:19 +0000)]
Merge "Fix text encoding in some macrobench tests"
Chien-Yu Chen [Tue, 28 Nov 2017 00:45:14 +0000 (16:45 -0800)]
ImageReader: Make discardFreeBuffers public
Test: CTS
Bug:
64847201
Change-Id: I61008111552b5ca4641a509e5bcf5cf821582d5e
Todd Kennedy [Wed, 29 Nov 2017 21:58:53 +0000 (13:58 -0800)]
Fix if clauses
During a refactor, we introduced updated the method used to
verify signatures. The "&& additionalTest" clauses were added
to the wrong if statement [off-by-one]. So, we were performing
a compat signature check when we shouldn't and not throwing
an exception when we should.
Change-Id: Ie479be5b254b9b13451ab07a07d20a68c7b828ad
Fixes:
69053002
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AppSecurityTests#testSharedUidDifferentCerts
Andre Eisenbach [Wed, 29 Nov 2017 21:51:20 +0000 (21:51 +0000)]
Merge "Bluetooth: Pre-pend empty line for dumpsys section headers" am:
8a95711ef1 am:
f51d382d9c
am:
2cd2bc357f
Change-Id: I02d4f21a1933bfe876b8fe60eb2b49e5771fe772
TreeHugger Robot [Wed, 29 Nov 2017 21:45:01 +0000 (21:45 +0000)]
Merge "Revert "Thread-safe metric producers.""
Jeff Sharkey [Wed, 29 Nov 2017 20:14:27 +0000 (13:14 -0700)]
Add build targets to build @SystemApi diffs.
Test: make -j32 offline-system-sdk-referenceonly-diff
Bug:
69115817
Change-Id: Ib25d8e60351cb2b4ce5001435baf92d7f738e5f2
Chavi Weingarten [Wed, 29 Nov 2017 21:42:37 +0000 (21:42 +0000)]
Merge "Revert "Updated screenshot code to reflect native changes.""
TreeHugger Robot [Wed, 29 Nov 2017 21:41:11 +0000 (21:41 +0000)]
Merge "Verify that b/
68859852 won't happen again"
Chavi Weingarten [Wed, 29 Nov 2017 21:26:24 +0000 (21:26 +0000)]
Revert "Updated screenshot code to reflect native changes."
This reverts commit
689e091c7faa30f005b9adc0b7b3d2066c62be84.
Reason for revert: SystemUI and some other places need to be updated as well. Will resubmit with the other necessary changes
Change-Id: I8d1955b289d91a89c4d3f117c0ba0c3119ff51fc
Bug:
69898957
Andre Eisenbach [Wed, 29 Nov 2017 21:36:44 +0000 (21:36 +0000)]
Merge "Bluetooth: Pre-pend empty line for dumpsys section headers" am:
8a95711ef1
am:
f51d382d9c
Change-Id: I698fd46b7784a9093ccfc23e6c1de020f2ac1d3b
Wale Ogunwale [Wed, 29 Nov 2017 21:30:26 +0000 (13:30 -0800)]
Don't start recents multiple times when entering split-screen
ActivityStack.setWindowingMode() takes care of starting the recents
activity when split-screen is activated so we don't need to do this
all over the place anymore.
Change-Id: I62153c4125744e9da533b6293e91c0658868bd1b
Fixes:
68952186
Test: ActivityManagerSplitScreenTests#testLaunchToSideAndBringToFront
TreeHugger Robot [Wed, 29 Nov 2017 21:25:59 +0000 (21:25 +0000)]
Merge "Fix crash in slices"
Andre Eisenbach [Wed, 29 Nov 2017 21:24:50 +0000 (21:24 +0000)]
Merge "Bluetooth: Pre-pend empty line for dumpsys section headers"
am:
8a95711ef1
Change-Id: I0dbe07aac6e6a8ea1b6858548bd26fffd7e21dd3
Todd Kennedy [Wed, 29 Nov 2017 21:17:12 +0000 (13:17 -0800)]
Update error text
Text was updated to be slightly more readable, but, wound up breaking
the tests. Reverting the word change.
Change-Id: I299245fc05f15ff6f7979c4c0365fe885b3c2e15
Fixes:
69056838
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.PkgInstallSignatureVerificationTest#testCorrectCertUsedFromPkcs7SignedDataCertsSet
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.PkgInstallSignatureVerificationTest#testV1SchemeSignatureCertNotReencoded
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.PkgInstallSignatureVerificationTest#testV2SchemeSignatureCertNotReencoded
Treehugger Robot [Wed, 29 Nov 2017 21:09:40 +0000 (21:09 +0000)]
Merge "Bluetooth: Pre-pend empty line for dumpsys section headers"
Winson Chung [Wed, 29 Nov 2017 21:05:26 +0000 (21:05 +0000)]
Merge "Fix issue with PiP callbacks not being handled" am:
bdd8adb006 am:
4e11a71210
am:
3b38be2962
Change-Id: Iecad54744e7491279f886305a03050be98d5c8a4
Arthur Ishiguro [Wed, 29 Nov 2017 21:00:54 +0000 (21:00 +0000)]
Merge changes Ibf8cd200,I4ea2f293,I17b545da,Ia139fd6d,I3a7e69f8
* changes:
Handles load and unload lifecycle callbacks
Handles hub reset at ContextHubClientManager
Converts old API message clients to the new API format
Implements client close and death notification
Creates framework for new API messaging
TreeHugger Robot [Wed, 29 Nov 2017 20:56:37 +0000 (20:56 +0000)]
Merge "Don't generate irrelevant a11y events - framework"
Winson Chung [Wed, 29 Nov 2017 20:50:00 +0000 (20:50 +0000)]
Merge "Fix issue with PiP callbacks not being handled" am:
bdd8adb006
am:
4e11a71210
Change-Id: I0ad21e140aa10566f58acfa01fb7e4172edca0d3
Android Build Merger (Role) [Wed, 29 Nov 2017 20:44:35 +0000 (20:44 +0000)]
Merge "Merge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case" am:
edfb333a4d am:
cca3c9bb01 am:
374bde37b9"
Hemant Gupta [Wed, 29 Nov 2017 20:42:42 +0000 (20:42 +0000)]
Merge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case" am:
edfb333a4d am:
cca3c9bb01
am:
374bde37b9
Change-Id: Ic0e5e0751c84b0f1a5ea3e4752d9eefb1e6d075a
TreeHugger Robot [Wed, 29 Nov 2017 20:40:24 +0000 (20:40 +0000)]
Merge "libandroidfw: Do not clear last resource id in ResolveReference"
Winson Chung [Wed, 29 Nov 2017 20:34:46 +0000 (20:34 +0000)]
Merge "Fix issue with PiP callbacks not being handled"
am:
bdd8adb006
Change-Id: I03c0ef06309b1b7559a973e2823598031de3b182
Hemant Gupta [Wed, 29 Nov 2017 20:29:53 +0000 (20:29 +0000)]
Merge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case" am:
edfb333a4d
am:
cca3c9bb01
Change-Id: Ia9edce62a31b5344b5627bf0d141d72d40d6e37c
Sudheer Shanka [Wed, 29 Nov 2017 20:22:42 +0000 (12:22 -0800)]
Don't fail the tests if per-freq cpu times are not available.
Test: N/A
Change-Id: I7c6c6aef7ea9ab431fb8b2c7f04b49299be73e9b
TreeHugger Robot [Wed, 29 Nov 2017 20:21:40 +0000 (20:21 +0000)]
Merge "Introduce Global.LOCATION_GLOBAL_KILL_SWITCH"
Nate Fischer [Wed, 29 Nov 2017 20:18:54 +0000 (12:18 -0800)]
WebView: linkify ClientCertRequest method names
No change to behavior, only docs changes. No change to wording.
This linkifies ClientCertRequest method names in the docs for
WebViewClient#onReceivedClientCertRequest.
Test: make docs (looks good, no errors)
Change-Id: I1de855e8cdf91b3aace3a188aafaa9ac9f90ed2a
Winson Chung [Wed, 29 Nov 2017 20:18:45 +0000 (20:18 +0000)]
Merge "Fix issue with PiP callbacks not being handled"