OSDN Git Service
Colin Cross [Thu, 26 Oct 2017 01:42:45 +0000 (01:42 +0000)]
Merge "Convert framework-protos to Android.bp" am:
d4609af986 am:
d78b46eb63
am:
5fec62ceb7
Change-Id: Ice5e7dfcf2ac8d58cde7cc5691271e318a45582d
TreeHugger Robot [Thu, 26 Oct 2017 01:30:29 +0000 (01:30 +0000)]
Merge "incidentd: Updating PowerManagerService proto files."
Colin Cross [Thu, 26 Oct 2017 01:25:56 +0000 (01:25 +0000)]
Merge "Convert framework-protos to Android.bp" am:
d4609af986
am:
d78b46eb63
Change-Id: I8721f2f3182c0d5a7b1717bde0c840c7e1864a41
TreeHugger Robot [Thu, 26 Oct 2017 01:13:59 +0000 (01:13 +0000)]
Merge "Move drag and drop related lines to DragDropController"
Colin Cross [Thu, 26 Oct 2017 01:11:13 +0000 (01:11 +0000)]
Merge "Convert framework-protos to Android.bp"
am:
d4609af986
Change-Id: I6ebf88a0931b7f9f49ac8044deb46b100129bb9f
Colin Cross [Thu, 26 Oct 2017 01:01:08 +0000 (01:01 +0000)]
Merge "Convert framework-protos to Android.bp"
Hans Boehm [Thu, 26 Oct 2017 00:34:23 +0000 (00:34 +0000)]
Merge "Fix issue #
64224738: Document return value of IBinder.transact()" am:
ceb336fc8a am:
05c93f1793 -s ours
am:
08cdf440c0 -s ours
Change-Id: I26d53b894cad3b746ca8bf651845a718413f321a
Hans Boehm [Thu, 26 Oct 2017 00:23:15 +0000 (00:23 +0000)]
Merge "Fix issue #
64224738: Document return value of IBinder.transact()" am:
ceb336fc8a
am:
05c93f1793 -s ours
Change-Id: I2a3e9b0a1a2e331fd0fa3063597fa450b624a473
Fyodor Kupolov [Thu, 26 Oct 2017 00:15:50 +0000 (00:15 +0000)]
Merge "Fixed issue with MAX_RUNNING_USERS"
Hans Boehm [Thu, 26 Oct 2017 00:12:52 +0000 (00:12 +0000)]
Merge "Fix issue #
64224738: Document return value of IBinder.transact()"
am:
ceb336fc8a
Change-Id: Ibcd3386a93a3bb5de8fb84a178678dab67beb464
Kurt Nelson [Thu, 26 Oct 2017 00:09:12 +0000 (00:09 +0000)]
Merge "Use annotation instead of comment"
Hans Boehm [Thu, 26 Oct 2017 00:01:12 +0000 (00:01 +0000)]
Merge "Fix issue #
64224738: Document return value of IBinder.transact()"
TreeHugger Robot [Wed, 25 Oct 2017 23:47:28 +0000 (23:47 +0000)]
Merge "Remove scheduling animation which is no longer needed"
Yifan Hong [Wed, 25 Oct 2017 22:50:57 +0000 (22:50 +0000)]
Merge "android.os.HwBinder: fix native static method signature" am:
65944e79b2 am:
21347cf052
am:
7f73cb73d2
Change-Id: I9ed7d60a00c80649de49a1b2359bf7a885d2dd0f
Yifan Hong [Wed, 25 Oct 2017 22:39:22 +0000 (22:39 +0000)]
Merge "android.os.HwBinder: fix native static method signature" am:
65944e79b2
am:
21347cf052
Change-Id: I6ee75f8c697a46105a30d68a8ad79f00f543f9ac
Yifan Hong [Wed, 25 Oct 2017 22:29:45 +0000 (22:29 +0000)]
Merge "android.os.HwBinder: fix native static method signature"
am:
65944e79b2
Change-Id: I09295da4a6021bd02c5c5e89d1d4ce3a8be82c96
Treehugger Robot [Wed, 25 Oct 2017 22:08:36 +0000 (22:08 +0000)]
Merge "android.os.HwBinder: fix native static method signature"
Kweku Adams [Mon, 23 Oct 2017 23:46:45 +0000 (16:46 -0700)]
incidentd: Updating PowerManagerService proto files.
Moving to the proto/.../server directory since PowerManagerService is in
com.android.server.
Extracting enums from other components into their own files.
Bug:
65750826
Bug:
65750806
Test: flash device and check incident.proto output
Change-Id: Ib91b7c08142fa66adf18b6e85106d4cbb5adf660
Fyodor Kupolov [Wed, 25 Oct 2017 21:23:43 +0000 (14:23 -0700)]
Fixed issue with MAX_RUNNING_USERS
Previously the user being switched could remain running if primary user
had work profile, due to counter being decremented twice.
Test: manual switch with work profiles and without + cts
Bug:
67091825
Change-Id: I61212c6407fecefa0094c6265dee6f3184d95701
Dianne Hackborn [Tue, 1 Aug 2017 00:38:53 +0000 (17:38 -0700)]
Fix issue #
64224738: Document return value of IBinder.transact()
Also add appropriate @NonNull and @Nullable annotations.
Test: built
Change-Id: I22de48105ef685baf594cfc004dd3e27e2ba09e9
Merged-In: I22de48105ef685baf594cfc004dd3e27e2ba09e9
(cherry picked from commit
4cd650c0085e6dd20d3f46c5b668e54537f887cf)
Brad Ebinger [Wed, 25 Oct 2017 21:13:13 +0000 (21:13 +0000)]
Merge "Fix dial emergency call redial issue by China Unicom." am:
3ab81b9694 am:
136c475d20
am:
a2e4e1530e
Change-Id: Ie77c5dcb32f501bf72fafbd4835ad18ab35841f3
Brad Ebinger [Wed, 25 Oct 2017 21:00:36 +0000 (21:00 +0000)]
Merge "Fix dial emergency call redial issue by China Unicom." am:
3ab81b9694
am:
136c475d20
Change-Id: If5700f3ffe35e898b47a8e9a9b7886f68dc7eeb8
TreeHugger Robot [Wed, 25 Oct 2017 20:58:52 +0000 (20:58 +0000)]
Merge "Start removing remaining pm code to package manager"
Kurt Nelson [Wed, 25 Oct 2017 20:49:26 +0000 (13:49 -0700)]
Use annotation instead of comment
Test: none
Bug: none
Change-Id: I723fba865116a203147dd5f2a6343b2cb29c65a2
Brad Ebinger [Wed, 25 Oct 2017 20:50:54 +0000 (20:50 +0000)]
Merge "Fix dial emergency call redial issue by China Unicom."
am:
3ab81b9694
Change-Id: I3895caab83c75a8f0d0251da6154d5a93fe09694
TreeHugger Robot [Wed, 25 Oct 2017 20:44:24 +0000 (20:44 +0000)]
Merge "Move grantPermission to permission manager"
Christine Franks [Wed, 25 Oct 2017 20:38:31 +0000 (20:38 +0000)]
Merge "DO NOT MERGE - Support native and srgb for night display" into oc-mr1-dev am:
2d110e6829
am:
10e9bc5ba7 -s ours
Change-Id: I31976f43ee46c37abc63d1680fea21e54329c785
Brad Ebinger [Wed, 25 Oct 2017 20:36:17 +0000 (20:36 +0000)]
Merge "Fix dial emergency call redial issue by China Unicom."
Christine Franks [Wed, 25 Oct 2017 20:28:07 +0000 (20:28 +0000)]
Merge "DO NOT MERGE - Support native and srgb for night display" into oc-mr1-dev
am:
2d110e6829
Change-Id: I0e805b480a3317548c219eb282fcf399b41b4ff1
Yifan Hong [Wed, 25 Oct 2017 20:19:22 +0000 (13:19 -0700)]
android.os.HwBinder: fix native static method signature
Test: pass
Change-Id: I54c384abaad7c7aafab31836f34edee5c7c75aac
Christine Franks [Wed, 25 Oct 2017 20:15:17 +0000 (20:15 +0000)]
Merge "DO NOT MERGE - Support native and srgb for night display" into oc-mr1-dev
TreeHugger Robot [Wed, 25 Oct 2017 20:11:39 +0000 (20:11 +0000)]
Merge "Prevent touch delegate from blocking parent events"
Jeff Sharkey [Wed, 25 Oct 2017 20:08:40 +0000 (20:08 +0000)]
Merge "Provide explicit Network via JobParameters."
TreeHugger Robot [Wed, 25 Oct 2017 19:43:21 +0000 (19:43 +0000)]
Merge "Removing some system binder calls in AppWidgetHostView"
Christine Franks [Wed, 25 Oct 2017 02:04:22 +0000 (19:04 -0700)]
DO NOT MERGE - Support native and srgb for night display
Bug:
68159303
Test: make -j100
Change-Id: Iea4b38bd8c9037f50b7ffa6e3c4f12b0e536a8ce
Dianne Hackborn [Fri, 20 Oct 2017 23:16:32 +0000 (16:16 -0700)]
Start removing remaining pm code to package manager
Everything is now moved out of the pm command except for
the various install commands. I am going to hold of on
those since they require doing some resolution with the
current implementations in the package manager to make
sure they match and behave identically to the implementations
currently in the pm command. But other than that, everything
in pm is now just redirecting over to "cmd package".
Also fix up some of the dumpsys output of a few other sevices
when asking to print the data for a particular package, so
the "pm dump" command gives a little more sane result.
Test: manual
Change-Id: I139e06e560203b72243d7eea9543c2240db0f8f8
Android Build Merger (Role) [Wed, 25 Oct 2017 19:15:38 +0000 (19:15 +0000)]
Merge "Merge "Make it possible to dial an operator specific code" am:
f4f4ba3d42 am:
6519e65ed8 am:
a44a9d8b98"
Jordan Liu [Wed, 25 Oct 2017 19:12:47 +0000 (19:12 +0000)]
Merge "Make it possible to dial an operator specific code" am:
f4f4ba3d42 am:
6519e65ed8
am:
a44a9d8b98
Change-Id: I7424799b74b61d3f507fbe8fb99c09d48e30cba8
TreeHugger Robot [Wed, 25 Oct 2017 19:11:34 +0000 (19:11 +0000)]
Merge "Revert "Removing stats service registration in system server""
Lei Yu [Wed, 25 Oct 2017 18:57:59 +0000 (18:57 +0000)]
Merge "Renaming in BluetoothTile and QSDetailItems"
Jordan Liu [Wed, 25 Oct 2017 18:51:21 +0000 (18:51 +0000)]
Merge "Make it possible to dial an operator specific code" am:
f4f4ba3d42
am:
6519e65ed8
Change-Id: Ic13742cb8e39beaf8ab722ac9203c22c5e5a83f8
TreeHugger Robot [Wed, 25 Oct 2017 18:43:39 +0000 (18:43 +0000)]
Merge "incidentd: Adding proto dump for AlarmManager."
Jordan Liu [Wed, 25 Oct 2017 18:40:33 +0000 (18:40 +0000)]
Merge "Make it possible to dial an operator specific code"
am:
f4f4ba3d42
Change-Id: I9af399f6ab0d5f95e76b0fd3cc769acc6a75a5b5
Jordan Liu [Wed, 25 Oct 2017 18:22:31 +0000 (18:22 +0000)]
Merge "Make it possible to dial an operator specific code"
Michael Wachenschwanz [Wed, 25 Oct 2017 18:20:56 +0000 (18:20 +0000)]
Merge "Java side setup and access to Binder Proxy Tracking"
Jeff Sharkey [Wed, 25 Oct 2017 17:54:35 +0000 (17:54 +0000)]
Merge "Improve NetworkCapabilities docs." am:
14a51058b1 am:
b385ba095b
am:
f9ae47c5da
Change-Id: I33ef6f930529f9c6e8502613633fffccaa18c192
Jeff Sharkey [Wed, 25 Oct 2017 17:35:44 +0000 (17:35 +0000)]
Merge "Improve NetworkCapabilities docs." am:
14a51058b1
am:
b385ba095b
Change-Id: I3a685156e46c980078c3a91b36e9c1301c29240f
Sunny Goyal [Tue, 24 Oct 2017 23:14:12 +0000 (16:14 -0700)]
Removing some system binder calls in AppWidgetHostView
> Using the AppWidgetProviderInfo for applicationInfo instead of getting
it from packageNamager
> Sending ProviderInfo update when the package is suspended/unsuspended so
that the provider info on client side is always up-to-date
Bug:
67865199
Test: Manually tested on device
Change-Id: Id44facc30b4c3cc01e155eba9feeb541997fc816
Jeff Sharkey [Wed, 25 Oct 2017 17:25:17 +0000 (17:25 +0000)]
Merge "Improve NetworkCapabilities docs."
am:
14a51058b1
Change-Id: Ib3c6dd78c7ed41526a734fbc91a81cb4c7fae6d7
Jeff Sharkey [Tue, 24 Oct 2017 22:55:04 +0000 (16:55 -0600)]
Provide explicit Network via JobParameters.
On devices with multiple active networks, or rapidly switching
between networks, we need an API to tell jobs explicitly which
network to use. (For example, the default route could meet all
job criteria, but we could have changed the default network by the
time we spun up the JobService.)
This also paves the way for us choosing to run jobs over
non-default networks.
Test: verified via DownloadManager
Bug:
64133169
Change-Id: Ic8d654707e39236c8da85a5e172161ac39e5f0b3
Treehugger Robot [Wed, 25 Oct 2017 17:16:03 +0000 (17:16 +0000)]
Merge "Improve NetworkCapabilities docs."
Wale Ogunwale [Wed, 25 Oct 2017 17:14:51 +0000 (17:14 +0000)]
Merge "taskReturnToType be gone!"
TreeHugger Robot [Wed, 25 Oct 2017 17:05:44 +0000 (17:05 +0000)]
Merge changes Ifee27c86,I9ffa4b00
* changes:
Add more atoms to statsd
Add wakelock atom to statsd
TreeHugger Robot [Wed, 25 Oct 2017 17:04:54 +0000 (17:04 +0000)]
Merge "Add some atoms to statsd"
Andrew Solovay [Wed, 25 Oct 2017 16:29:41 +0000 (16:29 +0000)]
Merge "docs: Fixing P1 formatting problem on Javadocs" into oc-mr1-dev am:
c470a72024
am:
c257e42e3f
Change-Id: I7adb6b257080c28a8cabd1e99d436d77ce5dbaa2
Andrew Solovay [Wed, 25 Oct 2017 16:18:37 +0000 (16:18 +0000)]
Merge "docs: Fixing P1 formatting problem on Javadocs" into oc-mr1-dev
am:
c470a72024
Change-Id: Id17bb6f9a4609b09a1425392bd1b4e8840e7eb1d
Andrew Solovay [Wed, 25 Oct 2017 16:05:50 +0000 (16:05 +0000)]
Merge "docs: Fixing P1 formatting problem on Javadocs" into oc-mr1-dev
Siarhei Vishniakou [Sat, 21 Oct 2017 01:06:57 +0000 (18:06 -0700)]
Prevent touch delegate from blocking parent events
Make sure that TouchDelegate does not interfere with
handling of parent's events, such as onClick().
Currently, the variable mDelegateTargeted is sticky,
and after the TouchDelegate is first activated,
stays true for the remainder of its life. Therefore, the
parent view will no longer receive clicks after the
TouchDelegate is first clicked. This patch forces the
re-evaluation of mDelegateTargeted on each new ACTION_DOWN
event.
Test: bit CtsViewTestCases:.TouchDelegateTest
Bug:
65392236
Change-Id: Ifa6430ce6e8400c0411df7da66281219ea97733c
TreeHugger Robot [Wed, 25 Oct 2017 15:40:06 +0000 (15:40 +0000)]
Merge "Don't clear a layerPool that is never initialized."
TreeHugger Robot [Wed, 25 Oct 2017 15:12:59 +0000 (15:12 +0000)]
Merge "Avoid changing resize dim layer if not needed"
Bryce Lee [Wed, 25 Oct 2017 14:18:22 +0000 (14:18 +0000)]
Merge "Initial implementation of LaunchingBoundsController."
Erik Kline [Wed, 25 Oct 2017 14:07:34 +0000 (14:07 +0000)]
Merge "Switch to listening for CarrierConfig changes for provisioning rechecks" am:
c21effd526 am:
166c27440d
am:
fc0b863b44
Change-Id: I2e46e8271209798692d5074d336ef73eb96370bb
Erik Kline [Wed, 25 Oct 2017 13:58:16 +0000 (13:58 +0000)]
Merge "Switch to listening for CarrierConfig changes for provisioning rechecks" am:
c21effd526
am:
166c27440d
Change-Id: I16c6e768d8df46d2d11947edc0c5620dd3f1b2a9
Paul Duffin [Wed, 25 Oct 2017 13:57:32 +0000 (13:57 +0000)]
Merge "Build stubs against SDK and clear local variables"
Derek Sollenberger [Wed, 25 Oct 2017 13:52:23 +0000 (09:52 -0400)]
Don't clear a layerPool that is never initialized.
Test: device now boots in Vulkan without crash
Change-Id: Ib0a3d8253a49fbcdb75e9f4edda0c32d06903669
Erik Kline [Wed, 25 Oct 2017 13:47:31 +0000 (13:47 +0000)]
Merge "Switch to listening for CarrierConfig changes for provisioning rechecks"
am:
c21effd526
Change-Id: I58dfd65873b65a59b832afea88f8d246b088aa6b
Treehugger Robot [Wed, 25 Oct 2017 13:37:40 +0000 (13:37 +0000)]
Merge "Switch to listening for CarrierConfig changes for provisioning rechecks"
Jorim Jaggi [Wed, 25 Oct 2017 13:20:24 +0000 (15:20 +0200)]
Avoid changing resize dim layer if not needed
UPDATE_DOCKED_STACK_DIVIDER gets called fairly frequently.
When we switched to having a stack per task,
TaskStack.resetAdjustedForIme was called a lot more frequently,
leading to a lot of empty surface transaction binder calls, which
took very long to execute.
We fix this by avoid calling setResizeDimLayer as well as avoid
even creating a transaction when the dim layer hasn't changed.
Test: go/wm-smoke
Test: Resize docked stack, check IME adjust animations
Change-Id: I75e64c6e3ac77012388c68c6750a426bd3ed6e21
Fixes:
67747409
Bug:
67780926
Andrei Stingaceanu [Wed, 25 Oct 2017 09:56:16 +0000 (10:56 +0100)]
[Magnifier - 7] Minor cleanup
Remove uselsess annotations on primitives.
Bug:
63531115
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: manual test that shows the magnifier working
Change-Id: I1e15e18d57af23d25a347d644ea57372e32adb59
Dave Friedman [Wed, 25 Oct 2017 07:22:10 +0000 (07:22 +0000)]
Merge "Docs: Adds brief instructions for how to do Wi-Fi scan. Bug:
67967771 Test: Ran make ds-docs." into oc-dev am:
44cd5b97ad am:
25c008d9b1 am:
b8057e3178
am:
37de23b48f
Change-Id: I75e0caf9d0ffa543281e6efb14ac57099af99ff5
Dave Friedman [Wed, 25 Oct 2017 07:10:33 +0000 (07:10 +0000)]
Merge "Docs: Adds brief instructions for how to do Wi-Fi scan. Bug:
67967771 Test: Ran make ds-docs." into oc-dev am:
44cd5b97ad am:
25c008d9b1
am:
b8057e3178
Change-Id: Iaadb41606ae388d539490abf9289ea1d66c5d833
Dave Friedman [Wed, 25 Oct 2017 06:59:38 +0000 (06:59 +0000)]
Merge "Docs: Adds brief instructions for how to do Wi-Fi scan. Bug:
67967771 Test: Ran make ds-docs." into oc-dev am:
44cd5b97ad
am:
25c008d9b1
Change-Id: I740781c9ddd2207d15ea285748c9971139fe50ad
Dave Friedman [Wed, 25 Oct 2017 06:48:22 +0000 (06:48 +0000)]
Merge "Docs: Adds brief instructions for how to do Wi-Fi scan. Bug:
67967771 Test: Ran make ds-docs." into oc-dev
am:
44cd5b97ad
Change-Id: I228d7395c9de8e164a0110c0d4fdf4530c7690ec
TreeHugger Robot [Wed, 25 Oct 2017 06:22:54 +0000 (06:22 +0000)]
Merge "Docs: Adds brief instructions for how to do Wi-Fi scan. Bug:
67967771 Test: Ran make ds-docs." into oc-dev
Steven Moreland [Wed, 25 Oct 2017 06:19:38 +0000 (06:19 +0000)]
Merge "Revert "HIDL Java getService now the same as C++."" am:
65d1e549b6 am:
4868f5311e
am:
b29739e1c9
Change-Id: I0a11131c6736f03b15e967990edbbbd47b6537ed
Android Build Merger (Role) [Wed, 25 Oct 2017 06:02:01 +0000 (06:02 +0000)]
Merge changes from topic "am-
e99469bff1324e56a42a31403070d131"
* changes:
Merge changes from topic "keystorebp" am:
a12eab69d1 am:
315bbfc213 am:
2461194985
Export AIDL for keystore Android.bp. am:
01478ec183 am:
f179a478bf am:
b5154d71b2 -s ours
Colin Cross [Wed, 25 Oct 2017 05:57:34 +0000 (05:57 +0000)]
Merge changes from topic "keystorebp" am:
a12eab69d1 am:
315bbfc213
am:
2461194985
Change-Id: Ibb0723012dd3a2e1a5b12810acd77c0a24292208
Steven Moreland [Wed, 25 Oct 2017 05:56:47 +0000 (05:56 +0000)]
Merge "Revert "HIDL Java getService now the same as C++."" am:
65d1e549b6
am:
4868f5311e
Change-Id: I80789cb8e1cf0d49e3f85fffe29a12eb74b7726e
TreeHugger Robot [Wed, 25 Oct 2017 05:53:55 +0000 (05:53 +0000)]
Merge "Fixing CTS regression"
Jeff Sharkey [Wed, 25 Oct 2017 05:51:16 +0000 (05:51 +0000)]
Export AIDL for keystore Android.bp. am:
01478ec183 am:
f179a478bf
am:
b5154d71b2 -s ours
Change-Id: I1be34c9ba628ba07d0d3095a144fa974345f1d91
Colin Cross [Wed, 25 Oct 2017 05:39:06 +0000 (05:39 +0000)]
Merge changes from topic "keystorebp" am:
a12eab69d1
am:
315bbfc213
Change-Id: I5ac8aa1079a4fdb23a8745e9998d947c85c98e7f
Andreas Gampe [Wed, 25 Oct 2017 05:37:12 +0000 (05:37 +0000)]
Merge "resolve merge conflicts of
1fae62661258 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp
am:
c4ca931dc5
Change-Id: I6c42eb5cb874dc359cc8b9c3e01244182197faf3
Jeff Sharkey [Wed, 25 Oct 2017 05:34:10 +0000 (05:34 +0000)]
Export AIDL for keystore Android.bp. am:
01478ec183
am:
f179a478bf
Change-Id: I38d1cb28539eff3f136b2ec0bb730302d716c278
Andreas Gampe [Wed, 25 Oct 2017 05:22:04 +0000 (05:22 +0000)]
Merge "resolve merge conflicts of
1fae62661258 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp
Steven Moreland [Wed, 25 Oct 2017 05:17:19 +0000 (05:17 +0000)]
Merge "Revert "HIDL Java getService now the same as C++.""
am:
65d1e549b6
Change-Id: I545166bd11ee2a38b43743ebb4559429e1b22349
Colin Cross [Wed, 25 Oct 2017 05:07:24 +0000 (05:07 +0000)]
Merge changes from topic "keystorebp"
am:
a12eab69d1
Change-Id: I4a6f7f84d683582d126a6370e1cf3ae6ee9f4b19
Jeff Sharkey [Wed, 25 Oct 2017 05:01:29 +0000 (05:01 +0000)]
Export AIDL for keystore Android.bp.
am:
01478ec183
Change-Id: Ie2308e809410e1c8237095c7f74bce08b8f76397
Chia-I Wu [Wed, 25 Oct 2017 04:54:24 +0000 (04:54 +0000)]
Merge "Add color mode setting" into oc-mr1-dev am:
19aa8ae955
am:
51c2848c44
Change-Id: I97fb37429e97c59b223a36431f59c43c86c92ab0
Steven Moreland [Wed, 25 Oct 2017 04:50:08 +0000 (04:50 +0000)]
Merge "Revert "HIDL Java getService now the same as C++.""
Steven Moreland [Wed, 25 Oct 2017 04:46:26 +0000 (04:46 +0000)]
Revert "HIDL Java getService now the same as C++."
Appears to be causing problems on 2017 devices.
This reverts commit
c1f00f8cd895e38c74ed1cb1adff33065ccecd06.
Change-Id: I6c1717a612bfa3fe63f08160a1db652c284f6ba4
TreeHugger Robot [Wed, 25 Oct 2017 04:44:15 +0000 (04:44 +0000)]
Merge "App Bucketing for Standby"
Colin Cross [Wed, 25 Oct 2017 04:43:08 +0000 (04:43 +0000)]
Merge changes from topic "keystorebp"
* changes:
Convert lockregioncodeinjection to Android.bp
Export AIDL for keystore Android.bp.
Chia-I Wu [Wed, 25 Oct 2017 04:38:29 +0000 (04:38 +0000)]
Merge "Add color mode setting" into oc-mr1-dev
am:
19aa8ae955
Change-Id: I99821d20c99ae46537640cde4418c9079a46f6f1
Chia-I Wu [Wed, 25 Oct 2017 04:28:58 +0000 (04:28 +0000)]
Merge "Add color mode setting" into oc-mr1-dev
Andreas Gampe [Wed, 25 Oct 2017 03:37:02 +0000 (20:37 -0700)]
resolve merge conflicts of
1fae62661258 to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I091e95c259029c7380f269a4258cc269458d2020
Jeff Sharkey [Wed, 25 Oct 2017 03:25:50 +0000 (21:25 -0600)]
Improve NetworkCapabilities docs.
Add IntDef for constants, and rely on new auto-documentation feature
to expand all of them at usage sites.
Test: docs-only change
Bug:
64133169
Change-Id: I8a6b5f54c8eb9d4fc7ae3d0d3fb673d52320664b
Bookatz [Wed, 25 Oct 2017 03:10:31 +0000 (20:10 -0700)]
Add more atoms to statsd
The following events are added to statsd:
WifiLockStateChanged
WifiSignalStrengthChanged
WifiSignalStrengthChanged
PhoneSignalStrengthChanged
Test: manually confirmed these show up in the statslog.
Change-Id: Ifee27c86a28616d8cb9d43bdf11f9cabe2b367c6
TreeHugger Robot [Wed, 25 Oct 2017 02:54:43 +0000 (02:54 +0000)]
Merge "BatteryService: allow IBatteryPropertiesRegistrar.scheduleUpdate calls"
Andreas Gampe [Wed, 25 Oct 2017 02:53:19 +0000 (02:53 +0000)]
Merge changes I119cf83a,Icc5a1e38,If07a04d3
am:
61e3189ec7
Change-Id: I2ef7c49b23314a5cb94671bba0d3891b6b7c3920
TreeHugger Robot [Wed, 25 Oct 2017 02:47:06 +0000 (02:47 +0000)]
Merge "Fallback hyphenation for minority Indic languages"