OSDN Git Service
Evan Rosky [Tue, 14 Nov 2017 19:04:54 +0000 (11:04 -0800)]
Fix focusfinder coretests
beams are no-longer considered overlapping if edges touch. These
coretests weren't updated to reflect that.
Bug:
67467972
Test: android.view.FocusFinderTest
Change-Id: Ibc1535c1b232fe1c42104ff8970b371fbc8a7c25
TreeHugger Robot [Mon, 13 Nov 2017 20:31:52 +0000 (20:31 +0000)]
Merge "Sync PRIV_APP_OOB_ENABLED setting to pm.dexopt.priv-apps-oob"
TreeHugger Robot [Mon, 13 Nov 2017 20:30:58 +0000 (20:30 +0000)]
Merge "Add api lint to upload checks"
Dmitry Dementyev [Mon, 13 Nov 2017 20:16:52 +0000 (20:16 +0000)]
Merge "Get rid of manually created IKeystoreService."
TreeHugger Robot [Mon, 13 Nov 2017 20:11:49 +0000 (20:11 +0000)]
Merge "Don't show "always use" when app can't be default"
TreeHugger Robot [Mon, 13 Nov 2017 20:02:41 +0000 (20:02 +0000)]
Merge "Change conditional keep rule syntax"
Seigo Nonaka [Sat, 11 Nov 2017 00:02:17 +0000 (00:02 +0000)]
Revert "Store FontCollection in MinikinPaint"
This regresses the performance.
Bug:
69165958
This reverts commit
c0a35e7b0ecbd35c9c39205fec6ef2555e86db8b.
Change-Id: I86f0b55dc83fdde4ca04659ec0f7bb3589f571fa
Jason Monk [Fri, 10 Nov 2017 20:43:17 +0000 (15:43 -0500)]
Add api lint to upload checks
Currently will never block upload, only considered a warning, but
will print out any lint issues discovered.
Test: do an upload
Bug:
69115822
Change-Id: I69b8e5a3f92ac28ee3c954408e88a1056c33af65
Victor Hsieh [Tue, 7 Nov 2017 19:12:51 +0000 (11:12 -0800)]
Sync PRIV_APP_OOB_ENABLED setting to pm.dexopt.priv-apps-oob
The settings value is used as a proxy for server side experiment to
populate configuration to the device. This is only for experiment and
should be removed later.
Test: adb shell settings put global priv_app_oob_enabled 0
# saw pm.dexopt.priv-apps-oob changed to false
Test: adb shell settings put global priv_app_oob_enabled 1
# saw pm.dexopt.priv-apps-oob changed to true
Bug:
67415855
Bug:
63920015
Change-Id: I4eb2beb14cd2c86c4bfc439d9742e95d3aba45a9
Jan Althaus [Mon, 6 Nov 2017 11:31:59 +0000 (12:31 +0100)]
Update smart select metrics for new system event fields
We are now adding new system UI event fields specifically for smart select.
This CL adds corresponding new metric field values and changes the log
event building accordingly.
Bug:
67674199
Test: Manually tested that the logs are correct.
Change-Id: I5b90c8b194de2d46d7d6be1f1c314be9a2239298
TreeHugger Robot [Mon, 13 Nov 2017 06:43:44 +0000 (06:43 +0000)]
Merge "Introduce CrossProfileApps API"
Chenjie Yu [Tue, 7 Nov 2017 01:56:44 +0000 (17:56 -0800)]
add CpuTimePerUidPuller and CpuTimePerUidFreqPuller
Note: these pullers return monotonically increasing numbers.
The uids could include isolated uids that needs further translation in
statsd.
Test: manually tested on device and check print outs
Change-Id: I7097aec0417a3ac567b9b86149b757ac27cd58d8
Chenjie Yu [Fri, 3 Nov 2017 16:33:15 +0000 (09:33 -0700)]
pull cpu time per freq
also adjust lock for ValueMetricProducer.cpp
Test: manual test
Change-Id: Ib96e3011d7bcf44ac92346d880196c425623a86f
TreeHugger Robot [Sat, 11 Nov 2017 03:44:38 +0000 (03:44 +0000)]
Merge "Implement Cpu Info Section"
TreeHugger Robot [Sat, 11 Nov 2017 03:32:40 +0000 (03:32 +0000)]
Merge "Inform WindowManager when Activity is reordered to front."
Chih-hung Hsieh [Sat, 11 Nov 2017 02:32:01 +0000 (02:32 +0000)]
Merge "Use -Werror in frameworks/base/core/tests/webkit/apk_with_native_libs"
Yi Jin [Thu, 2 Nov 2017 00:08:27 +0000 (17:08 -0700)]
Implement Cpu Info Section
Support carriage return in Read class, and add a new way to parse lines
which is not able to split purly by delimiters
Bug:
65642861
Test: unit test and on device test
Change-Id: Ib82dd4e458bb7d2fa33462b23fbe11b828325916
TreeHugger Robot [Sat, 11 Nov 2017 01:22:55 +0000 (01:22 +0000)]
Merge "Create magnifier bench scene"
TreeHugger Robot [Sat, 11 Nov 2017 01:18:12 +0000 (01:18 +0000)]
Merge "Revert "Eliminate native/JNI/callback USB Descriptor parsing mechanism""
TreeHugger Robot [Sat, 11 Nov 2017 01:03:59 +0000 (01:03 +0000)]
Merge "make statsd less chatty."
Bryce Lee [Fri, 8 Sep 2017 22:55:22 +0000 (15:55 -0700)]
Inform WindowManager when Activity is reordered to front.
This event was captured on the ActivityManager side through
TaskRecord::moveActivityToFrontLocked. However, this change was
not conveyed to the WindowManager, leading to potential issues, such
as sending key events to the wrong Activity.
Change-Id: Ia5cf3dc0f2dac8fa10adc775c2ebb08beee0c064
Fixes:
65031003
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerActivityVisibilityTests#testReorderToFrontBackstack
(cherry picked from commit
c033f8de620db59ff94ef905a4ab66ac3e212c06)
TreeHugger Robot [Sat, 11 Nov 2017 00:46:54 +0000 (00:46 +0000)]
Merge "1. Add FIELD_COUNT_REPEATED bit masks to repeated fields that were previously missing 2. Resolve segfault when serializing proto into vector of uint8_t 3. Add a local byte size variable for EventMetric data as we cannot call size() of ProtoOutputStream before we finish writing. 4. Replace hardcoded conversion of second to nano second with NS_PER_SEC"
TreeHugger Robot [Sat, 11 Nov 2017 00:28:02 +0000 (00:28 +0000)]
Merge "Updating MediaStore to support localized audio titles"
Patrick Plunkett [Fri, 10 Nov 2017 23:27:26 +0000 (23:27 +0000)]
Merge "Allow activities on secondary displays to dismiss keyguard"
John Reck [Fri, 10 Nov 2017 23:06:32 +0000 (15:06 -0800)]
Create magnifier bench scene
Test: this
Change-Id: Iea1033fda55ff0946b5cd8d28ecba29453b937ca
Chih-Hung Hsieh [Fri, 10 Nov 2017 22:53:00 +0000 (14:53 -0800)]
Use -Werror in frameworks/base/core/tests/webkit/apk_with_native_libs
* Comment out unused parameter names.
Bug:
66996870
Test: build with WITH_TIDY=1
Change-Id: If58bb6098f92e78400c71e7418a956a08bab6c36
Yao Chen [Fri, 10 Nov 2017 22:35:58 +0000 (14:35 -0800)]
make statsd less chatty.
Test: builds and adb logcat
Change-Id: I06ee9cce1844b21ed3960bbaf76262fca3357bf4
TreeHugger Robot [Fri, 10 Nov 2017 22:25:28 +0000 (22:25 +0000)]
Merge "Fixed a NP when clearing notifications"
TreeHugger Robot [Fri, 10 Nov 2017 21:50:03 +0000 (21:50 +0000)]
Merge "Fixes the connection listener wrong thread crash for overview proxy"
Jakub Pawlowski [Fri, 10 Nov 2017 21:38:51 +0000 (21:38 +0000)]
Merge "Move connectSocket into IBluetoothSocketManager (3/3)"
TreeHugger Robot [Fri, 10 Nov 2017 21:31:53 +0000 (21:31 +0000)]
Merge "Change pm.dexopt.priv-apps to .priv-apps-oob"
TreeHugger Robot [Fri, 10 Nov 2017 21:30:32 +0000 (21:30 +0000)]
Merge "Fix NPE for devices without StatusBar implementation."
TreeHugger Robot [Fri, 10 Nov 2017 21:26:53 +0000 (21:26 +0000)]
Merge "Consider only the top most stacks for visibility test"
TreeHugger Robot [Fri, 10 Nov 2017 20:56:02 +0000 (20:56 +0000)]
Merge "DND behavior system sounds cannot bypass DND"
Hall Liu [Fri, 10 Nov 2017 20:16:00 +0000 (20:16 +0000)]
Merge "Update Telecom APIs to include multi-hfp" am:
025718e8f6 am:
3dd41b7b29
am:
518a82c94a
Change-Id: I0309cfd98f38a54b741a9dc09d1fb65159d5a4b7
Pierre Lecesne [Fri, 10 Nov 2017 20:09:47 +0000 (20:09 +0000)]
Merge "Refactor Convert command to use a ISerializer interface."
Hall Liu [Fri, 10 Nov 2017 20:07:15 +0000 (20:07 +0000)]
Merge "Update Telecom APIs to include multi-hfp" am:
025718e8f6
am:
3dd41b7b29
Change-Id: I27922fafa9c092e281c80fc6aa5f96c8e4e0c461
Hall Liu [Fri, 10 Nov 2017 19:58:20 +0000 (19:58 +0000)]
Merge "Update Telecom APIs to include multi-hfp"
am:
025718e8f6
Change-Id: I08e0646c4dc20d45ea50d43d7e8b0deddf147bda
Hall Liu [Fri, 10 Nov 2017 19:49:01 +0000 (19:49 +0000)]
Merge "Update Telecom APIs to include multi-hfp"
Derek Sollenberger [Fri, 10 Nov 2017 19:44:42 +0000 (19:44 +0000)]
Merge "Fix bug in View system recording where Skia dropped the colorFilter."
Matthew Ng [Fri, 10 Nov 2017 19:27:29 +0000 (11:27 -0800)]
Fixes the connection listener wrong thread crash for overview proxy
Sending connection callbacks from binder thread crashes any layouts
called from the listener. Use the original handler to post connections
to fix this crash.
Bug:
67957962
Test: manual, reinstall launcher to re-establish the connection
Change-Id: I958d86346c41cbf1e9a0dc8bdeae957ec64f8a55
Adam Koski [Fri, 10 Nov 2017 19:15:55 +0000 (11:15 -0800)]
Change conditional keep rule syntax
Google's ProGuard fork is migrating to a new syntax that upstream
ProGuard 6.0 will also support.
Test: unit tests
Bug:
69162105
Change-Id: I3b6d7e82eb99c2e2af6c4d851a4f97ec3e471b55
Calvin On [Fri, 10 Nov 2017 19:19:59 +0000 (11:19 -0800)]
Fix NPE for devices without StatusBar implementation.
Bug:
68949061
Change-Id: I025ea812b7fed79c4c22b1c68b4fe3ea17300be1
TreeHugger Robot [Fri, 10 Nov 2017 19:14:43 +0000 (19:14 +0000)]
Merge "Remove unnecessary parameter WriteStringToFile"
yro [Fri, 10 Nov 2017 04:36:25 +0000 (20:36 -0800)]
1. Add FIELD_COUNT_REPEATED bit masks to repeated fields that were previously missing
2. Resolve segfault when serializing proto into vector of uint8_t
3. Add a local byte size variable for EventMetric data as we cannot call
size() of ProtoOutputStream before we finish writing.
4. Replace hardcoded conversion of second to nano second with NS_PER_SEC
Test: statsd, statsd_test
Change-Id: I47a2ce2b05e6191c18596489682118edcb41e945
Beverly [Wed, 8 Nov 2017 23:14:59 +0000 (18:14 -0500)]
DND behavior system sounds cannot bypass DND
If media & system feedback is not allowed to bypass DND
(set in Do Not Disturb Behavior Settings), then touch sounds
and lock screen sounds cannot play sounds.
Bug:
69062790
Test: runtest -x frameworks/base/services/tests/notification/src/com/android/server/notification/ZenModeHelperTest.java
Change-Id: Ic599f61d73d06d0616e5a247c537ff35487b5449
Jakub Pawlowski [Mon, 6 Nov 2017 20:17:30 +0000 (12:17 -0800)]
Move connectSocket into IBluetoothSocketManager (3/3)
Bug:
68359837
Test: none
Change-Id: I1161a5fe74b034fba0112fd3a78bdf1fbace6e12
Adam Lesinski [Fri, 10 Nov 2017 19:00:10 +0000 (19:00 +0000)]
Merge "Check for null-terminator in ResStringPool::string8At"
Victor Hsieh [Thu, 9 Nov 2017 18:32:10 +0000 (10:32 -0800)]
Change pm.dexopt.priv-apps to .priv-apps-oob
Other than the renaming, the meaning is now opposite.
(cherry-picked from aosp/533101)
Test: build
Bug:
67415855
Bug:
63920015
Change-Id: I349c0b233079b5958e4a308d6c7ad9b3a54f157a
(cherry picked from commit
66a285d9d7afe197a5a562525641400db80edcef)
Greg Daniel [Fri, 10 Nov 2017 18:38:50 +0000 (18:38 +0000)]
Merge "Initialize pointer members in VulkanManager to null"
TreeHugger Robot [Fri, 10 Nov 2017 18:32:57 +0000 (18:32 +0000)]
Merge "Make SimpleCondition satisfactorily complicated."
TreeHugger Robot [Fri, 10 Nov 2017 18:31:11 +0000 (18:31 +0000)]
Merge "Fixes rotating tablet changing original dock side in landscape"
Evan Rosky [Fri, 10 Nov 2017 18:23:45 +0000 (18:23 +0000)]
Merge "Fix more coretests in light of no-initial-focus"
Evan Rosky [Fri, 10 Nov 2017 18:20:06 +0000 (18:20 +0000)]
Merge "Revert "Enable new initial-focus behavior for P""
Evan Rosky [Thu, 9 Nov 2017 19:25:24 +0000 (19:25 +0000)]
Revert "Enable new initial-focus behavior for P"
This reverts commit
4dc3289c942398507a8b6240559da599d11a3284.
Reason for revert: Pushback from bundled apps.
Bug:
68841055
Bug:
34520588
Change-Id: Id771a11c9b44baf5810240cca164bae9f468b5ad
Adam Lesinski [Fri, 10 Nov 2017 18:05:54 +0000 (18:05 +0000)]
Merge "AAPT2: Differentiate between Android and Java package names" into oc-mr1-dev am:
07d8249c4b
am:
cc8aa11f6c -s ours
Change-Id: If6a18f0d0807b558a2329ede06393eb18814a85d
Winson Chung [Fri, 10 Nov 2017 18:00:28 +0000 (10:00 -0800)]
Consider only the top most stacks for visibility test
Bug:
69121908
Test: Open app in recents, then go home and open another app, turn screen
off and ensure the device does not start the home activity.
Change-Id: I814cf177247b7fbba79dbd9ec2600f30dee23054
John Reck [Fri, 10 Nov 2017 17:56:38 +0000 (17:56 +0000)]
Merge "Allow hwuimacro to choose a renderer"
Jon Dormody [Fri, 10 Nov 2017 17:52:29 +0000 (17:52 +0000)]
Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev am:
ec741b83a3 am:
719e8b5412 am:
430ed07596
am:
24f9ac4ecf
Change-Id: I3e193dd4898637a08eb771419dfbb1c14a610b77
Adam Lesinski [Fri, 10 Nov 2017 17:50:49 +0000 (17:50 +0000)]
Merge "AAPT2: Differentiate between Android and Java package names" into oc-mr1-dev
am:
07d8249c4b
Change-Id: I0a3235052cea9041cf6c944f71879d304bce5a56
Jon Dormody [Fri, 10 Nov 2017 17:39:42 +0000 (17:39 +0000)]
Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev am:
ec741b83a3 am:
719e8b5412
am:
430ed07596
Change-Id: I672d6c2ff08bbe91c12bfacbe3b493ca17613ce1
Adam Lesinski [Fri, 10 Nov 2017 17:32:52 +0000 (17:32 +0000)]
Merge "AAPT2: Differentiate between Android and Java package names" into oc-mr1-dev
Wei Wang [Fri, 10 Nov 2017 05:45:29 +0000 (21:45 -0800)]
Remove unnecessary parameter WriteStringToFile
By default, WriteStringToFile will not follow link, the 'false'
parameter is unnecessary.
Test: build
Change-Id: Ied6dcbf2a85533108dc2f6d71a4571b44684e800
Kevin Hufnagle [Fri, 10 Nov 2017 17:32:10 +0000 (17:32 +0000)]
Merge "Merge "docs: Added SQLite versions used on API levels 26 and 27." into oc-mr1-dev am:
9e628b60ba" into oc-mr1-dev-plus-aosp
am:
be8f36d844
Change-Id: I1f64688b30ce70b66a2f07bc47fd199dc1e3dcb0
Jon Dormody [Fri, 10 Nov 2017 17:28:30 +0000 (17:28 +0000)]
Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev am:
ec741b83a3
am:
719e8b5412
Change-Id: I779bd97e6668809dfadf50d4361b6b88ee4ee710
Android Build Merger (Role) [Fri, 10 Nov 2017 17:21:15 +0000 (17:21 +0000)]
Merge "Merge "Fix: WindowManagerGlobal#setStoppedState failed by IOOBE" am:
4741faa258 am:
949ea9bb2a am:
aab6b51c11"
Tetsutoki Shiozawa [Fri, 10 Nov 2017 17:19:52 +0000 (17:19 +0000)]
Merge "Fix: WindowManagerGlobal#setStoppedState failed by IOOBE" am:
4741faa258 am:
949ea9bb2a
am:
aab6b51c11
Change-Id: If4be33e18a761a5ad2fb522fad046a2811818f90
TreeHugger Robot [Fri, 10 Nov 2017 17:19:50 +0000 (17:19 +0000)]
Merge "AAPT2: whitelist alphanums instead of blacklisting hyphens in package names."
Jon Dormody [Fri, 10 Nov 2017 17:14:04 +0000 (17:14 +0000)]
Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev
am:
ec741b83a3
Change-Id: I9d170c0baf186d074c77d2a98bd60bee66bfd701
Android Build Merger (Role) [Fri, 10 Nov 2017 17:13:37 +0000 (17:13 +0000)]
Merge "Merge "docs: Added SQLite versions used on API levels 26 and 27." into oc-mr1-dev am:
9e628b60ba" into oc-mr1-dev-plus-aosp
Kevin Hufnagle [Fri, 10 Nov 2017 17:10:14 +0000 (17:10 +0000)]
Merge "docs: Added SQLite versions used on API levels 26 and 27." into oc-mr1-dev
am:
9e628b60ba
Change-Id: Ic5825ded0298478088f25fb0b0d14e2a8c9cc27a
Tetsutoki Shiozawa [Fri, 10 Nov 2017 17:06:04 +0000 (17:06 +0000)]
Merge "Fix: WindowManagerGlobal#setStoppedState failed by IOOBE" am:
4741faa258
am:
949ea9bb2a
Change-Id: I8bc04464519557a7af8e4792f30bad901d206052
Kevin Hufnagle [Fri, 10 Nov 2017 17:01:17 +0000 (17:01 +0000)]
Merge "docs: Added SQLite versions used on API levels 26 and 27." into oc-mr1-dev
Jon Dormody [Fri, 10 Nov 2017 16:58:17 +0000 (16:58 +0000)]
Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev
Tetsutoki Shiozawa [Fri, 10 Nov 2017 16:57:22 +0000 (16:57 +0000)]
Merge "Fix: WindowManagerGlobal#setStoppedState failed by IOOBE"
am:
4741faa258
Change-Id: Ifc79d7ccd5d6837a39263b6ba9728f8b4d82f81d
TreeHugger Robot [Fri, 10 Nov 2017 16:55:43 +0000 (16:55 +0000)]
Merge "Fixed the group appear animation for messaging"
Yao Chen [Wed, 8 Nov 2017 00:36:43 +0000 (16:36 -0800)]
Make SimpleCondition satisfactorily complicated.
+ Support nested counting
+ Support StopAll
+ Added default_condition to SimpleCondition config
+ Some refactoring/clean up
+ Added unit tests
Test: Added unit tests, statsd_test
Change-Id: I6564ac2e068ce6810e8090c0818064c625c7847a
Treehugger Robot [Fri, 10 Nov 2017 16:47:00 +0000 (16:47 +0000)]
Merge "Fix: WindowManagerGlobal#setStoppedState failed by IOOBE"
Greg Daniel [Fri, 10 Nov 2017 16:32:58 +0000 (11:32 -0500)]
Initialize pointer members in VulkanManager to null
Test: manual local testing
Change-Id: If81db17858354844b96677137cf67449dd91854b
Yoshinori Hirano [Fri, 10 Nov 2017 15:33:03 +0000 (15:33 +0000)]
Merge "Send broadcast when location mode is about to change DO NOT MERGE" am:
a524e7d87d -s ours am:
120f85a516
am:
5401c94946 -s ours
Change-Id: I5976a11d9d302dd03567f2b8facf2afdf785b2ea
TreeHugger Robot [Fri, 10 Nov 2017 15:29:47 +0000 (15:29 +0000)]
Merge "Don't send PLUGIN_CHANGED broadcast unless something changed"
Yoshinori Hirano [Fri, 10 Nov 2017 15:25:16 +0000 (15:25 +0000)]
Merge "Send broadcast when location mode is about to change DO NOT MERGE" am:
a524e7d87d -s ours
am:
120f85a516
Change-Id: I00d764427db65fd2dcc8a93846cbe825a91b33ac
Yoshinori Hirano [Fri, 10 Nov 2017 15:15:44 +0000 (15:15 +0000)]
Merge "Send broadcast when location mode is about to change DO NOT MERGE"
am:
a524e7d87d -s ours
Change-Id: I5af03e211cda75d016131db6001ac6b79836a018
Treehugger Robot [Fri, 10 Nov 2017 15:07:04 +0000 (15:07 +0000)]
Merge "Send broadcast when location mode is about to change DO NOT MERGE"
TreeHugger Robot [Fri, 10 Nov 2017 14:34:52 +0000 (14:34 +0000)]
Merge "Support insets on secondary displays"
TreeHugger Robot [Fri, 10 Nov 2017 13:12:23 +0000 (13:12 +0000)]
Merge "Adjust services robotest makefile"
Wale Ogunwale [Mon, 6 Nov 2017 22:21:51 +0000 (14:21 -0800)]
Support insets on secondary displays
Indroduced DisplayFrames object to track frames used to calculate
window insets per display vs. at a global level in PhoneWindowManager.
Bug:
64148922
Test: bit FrameworksServicesTests:com.android.server.wm.ScreenDecorWindowTests
Test: go/wm-smoke
Change-Id: I4a668d6c2dd0bfa666cb6acecf663cf83545ea87
Bernardo Rufino [Thu, 9 Nov 2017 19:30:32 +0000 (19:30 +0000)]
Adjust services robotest makefile
In preparation for transport-related tests needed to make those fixes so
that Mockito annotations would work.
1. Switched from mockito-target-minus-junit4 to
mockito-robolectric-prebuilt. Otherwise we would get dexcache == null
error (similar to
https://groups.google.com/a/google.com/forum/#!topic/robolectric-users/gV0_59Kj2ME/discussion)
2. Removed unused frameworks-base-testutils because it included the
ill-suited mockito dependency (as per 1).
3. Tidied up by moving test dependencies to actual test target.
Test: make RunFrameworksServicesRoboTests
Change-Id: Idd4f13a9aa0327d74b58361ad02aa3313d30ac99
Victor Hsieh [Fri, 10 Nov 2017 10:48:48 +0000 (10:48 +0000)]
Merge "DO NOT MERGE Change pm.dexopt.priv-apps to .priv-apps-oob" am:
41f1ef8c02 -s ours am:
69692df44e
am:
35ab68faeb -s ours
Change-Id: Ib089f93d8a8aa47aef99808f191f7245a00fe366
Victor Hsieh [Fri, 10 Nov 2017 10:41:58 +0000 (10:41 +0000)]
Merge "DO NOT MERGE Change pm.dexopt.priv-apps to .priv-apps-oob" am:
41f1ef8c02 -s ours
am:
69692df44e
Change-Id: Ie309cd0f3441719e8b63a584aad547ee3ef9d833
Victor Hsieh [Fri, 10 Nov 2017 10:32:37 +0000 (10:32 +0000)]
Merge "DO NOT MERGE Change pm.dexopt.priv-apps to .priv-apps-oob"
am:
41f1ef8c02 -s ours
Change-Id: Icf296e0f93486f2ab9c9a1bdd6e8274b58341809
Adam Lesinski [Fri, 10 Nov 2017 10:24:56 +0000 (10:24 +0000)]
Merge "AAPT2: Workaround for feature splits without namespacing" into oc-mr1-dev am:
751e69b38b
am:
6385bbd860 -s ours
Change-Id: Ic1a8beb44a94af326e9af5a59a6431c1e77056bb
Treehugger Robot [Fri, 10 Nov 2017 10:22:17 +0000 (10:22 +0000)]
Merge "DO NOT MERGE Change pm.dexopt.priv-apps to .priv-apps-oob"
Adam Lesinski [Fri, 10 Nov 2017 10:13:26 +0000 (10:13 +0000)]
Merge "AAPT2: Workaround for feature splits without namespacing" into oc-mr1-dev
am:
751e69b38b
Change-Id: I8791a0cbfb32c25a0c73552c47509cce1d5f06e2
TreeHugger Robot [Fri, 10 Nov 2017 10:01:37 +0000 (10:01 +0000)]
Merge "AAPT2: Workaround for feature splits without namespacing" into oc-mr1-dev
Jakub Pawlowski [Fri, 10 Nov 2017 08:42:32 +0000 (08:42 +0000)]
Merge "Move createSocketChannel into IBluetoothSocketManager (3/3)" am:
3e9b9b74b4 am:
7b38581ded
am:
222f4a2c81
Change-Id: I88dd168c05343ed2cd2715a2b6da8eb5bae69600
Jakub Pawlowski [Fri, 10 Nov 2017 08:31:40 +0000 (08:31 +0000)]
Merge "Move createSocketChannel into IBluetoothSocketManager (3/3)" am:
3e9b9b74b4
am:
7b38581ded
Change-Id: I87b40395aa73c8f2d159adf2ac46a95cc70f300c
Jakub Pawlowski [Fri, 10 Nov 2017 08:22:05 +0000 (08:22 +0000)]
Merge "Move createSocketChannel into IBluetoothSocketManager (3/3)"
am:
3e9b9b74b4
Change-Id: Ic98a1281eb6f3f6d1deb450c5123913b2c8d25a6
Treehugger Robot [Fri, 10 Nov 2017 08:11:26 +0000 (08:11 +0000)]
Merge "Move createSocketChannel into IBluetoothSocketManager (3/3)"
TreeHugger Robot [Fri, 10 Nov 2017 07:34:32 +0000 (07:34 +0000)]
Merge "Split NotificationMediaManager out of StatusBar."