OSDN Git Service
Todd Kennedy [Wed, 1 Mar 2017 00:20:09 +0000 (16:20 -0800)]
fix typo
Fixes:
35840741
Test: None; it's a javadoc fix
Change-Id: Ic59fe12351c24630d7ba18ffaafeef8035be35f5
Youhan Wang [Mon, 27 Feb 2017 21:14:50 +0000 (21:14 +0000)]
Merge "Add Resource for TelephonyMonitor debug switch."
Dianne Hackborn [Mon, 27 Feb 2017 21:11:25 +0000 (21:11 +0000)]
Merge "Add new job scheduler constraints for "battery not low"."
Peng Xu [Mon, 27 Feb 2017 20:58:19 +0000 (20:58 +0000)]
Merge "Added implementation of shared memory NDK API"
TreeHugger Robot [Mon, 27 Feb 2017 20:40:12 +0000 (20:40 +0000)]
Merge "media: Add more detail for the use of metadata track."
TreeHugger Robot [Mon, 27 Feb 2017 20:39:31 +0000 (20:39 +0000)]
Merge "AccessPoint - Add Builder; Add unit tests for compareTo()"
TreeHugger Robot [Mon, 27 Feb 2017 20:34:17 +0000 (20:34 +0000)]
Merge "Change internal intents from android.* to com.android.internal.*"
TreeHugger Robot [Mon, 27 Feb 2017 20:28:53 +0000 (20:28 +0000)]
Merge "Provide some compatibility story for devs in the past"
TreeHugger Robot [Mon, 27 Feb 2017 20:25:48 +0000 (20:25 +0000)]
Merge "Don't log privapp-permissions violations for updated apps"
TreeHugger Robot [Mon, 27 Feb 2017 20:24:52 +0000 (20:24 +0000)]
Merge "Push chooser targets to the shortcut manager."
TreeHugger Robot [Mon, 27 Feb 2017 19:49:15 +0000 (19:49 +0000)]
Merge "Added customization to SaveInfo."
TreeHugger Robot [Mon, 27 Feb 2017 19:40:50 +0000 (19:40 +0000)]
Merge "media: Add new key for latency support"
TreeHugger Robot [Mon, 27 Feb 2017 19:34:08 +0000 (19:34 +0000)]
Merge "Fix ShapeDrawable mutate, add clone() support to ArcShape, OvalShape"
Android Build Merger (Role) [Mon, 27 Feb 2017 19:25:04 +0000 (19:25 +0000)]
Merge "DO NOT MERGE: Add the option to skip the initial brightness ramp when the screen turns on. am:
106f1443c1 -s ours am:
8beca4cc6f am:
5792d09b3d -s ours"
Julius D'souza [Mon, 27 Feb 2017 19:24:19 +0000 (19:24 +0000)]
DO NOT MERGE: Add the option to skip the initial brightness ramp when the screen turns on. am:
106f1443c1 -s ours am:
8beca4cc6f
am:
5792d09b3d -s ours
Change-Id: I3528973859744f0decee45e2e108ad61f9e5558c
Jorim Jaggi [Mon, 27 Feb 2017 19:22:28 +0000 (19:22 +0000)]
Merge "Update paint filer when updating thumbnail"
Julius D'souza [Mon, 27 Feb 2017 19:18:11 +0000 (19:18 +0000)]
DO NOT MERGE: Add the option to skip the initial brightness ramp when the screen turns on. am:
106f1443c1 -s ours
am:
8beca4cc6f
Change-Id: I798681141b035eb3f29ab4824f2807cdb21010d9
Julius D'souza [Mon, 27 Feb 2017 19:14:07 +0000 (19:14 +0000)]
DO NOT MERGE: Add the option to skip the initial brightness ramp when the screen turns on.
am:
106f1443c1 -s ours
Change-Id: I8541342d3466e4e1d686b3faa890830edadba940
Dianne Hackborn [Mon, 13 Feb 2017 18:08:42 +0000 (10:08 -0800)]
Add new job scheduler constraints for "battery not low".
Clean up the implementation of boolean constraints so that
they are in a single flags value that gets propagated all of
the way from JobInfo.Builder in to the JobStatus. Much simpler
and easier to add new constraints!
Also introduce some shell commands to make it easier to write
tests against the job scheduler (and other things tied to power).
One of the big things here is that there is a new sequence number
that propagates with battery updates, which we can look for in
the job scheduler to determine when a change the test has made
to battery state has actually gotten applied, to allow it to
safely and minimally wait until executing the condition being
tested.
Test: New BatteryConstraintTest suite added.
Change-Id: I11076d90b80ec25ee604c29b6a6dc2337fd867ce
Etan Cohen [Mon, 27 Feb 2017 18:51:46 +0000 (18:51 +0000)]
Merge "[AWARE] Remove (hide) sendMessage with retryCount API" am:
f81911bcd2 am:
97bf0f5e9b
am:
07864e35c8
Change-Id: Ic53ad1fed518057d75a59fd7d91dd7f4882700ce
Yifan Hong [Mon, 27 Feb 2017 18:46:22 +0000 (18:46 +0000)]
Merge "Vr HAL uses "default" service name"
Etan Cohen [Mon, 27 Feb 2017 18:46:11 +0000 (18:46 +0000)]
Merge "[AWARE] Remove (hide) sendMessage with retryCount API" am:
f81911bcd2
am:
97bf0f5e9b
Change-Id: Ib62285494ffee7a4c35bc3583417e0cacc0d5d83
Etan Cohen [Mon, 27 Feb 2017 18:42:05 +0000 (18:42 +0000)]
Merge "[AWARE] Remove (hide) sendMessage with retryCount API"
am:
f81911bcd2
Change-Id: I3791ee5fbd0c16de6156b0ad36e50091eea498f9
TreeHugger Robot [Mon, 27 Feb 2017 18:38:09 +0000 (18:38 +0000)]
Merge "don't call settings provider with pkg mgr lock"
Makoto Onuki [Mon, 27 Feb 2017 18:35:16 +0000 (18:35 +0000)]
Merge "Allow querying providers with a specific metadata."
Etan Cohen [Mon, 27 Feb 2017 18:33:34 +0000 (18:33 +0000)]
Merge "[AWARE] Remove (hide) sendMessage with retryCount API"
Hangyu Kuang [Tue, 21 Feb 2017 18:38:38 +0000 (10:38 -0800)]
media: Add more detail for the use of metadata track.
Test: None as just documentation.
Bug:
28536560
Change-Id: Ie9a765b02fb304b16146c314eeb89758b9cd4a4d
TreeHugger Robot [Mon, 27 Feb 2017 18:24:06 +0000 (18:24 +0000)]
Merge "Remove tint from network logging icon"
Felipe Leme [Fri, 24 Feb 2017 20:53:27 +0000 (12:53 -0800)]
Added customization to SaveInfo.
Bug:
35727295
Test: CtsAutoFillServiceTestCases pass
Test: m update-api
Change-Id: I7eba36b6ab8181ae1cdbd10b0879927b9f9cf086
Hangyu Kuang [Thu, 23 Feb 2017 23:08:52 +0000 (15:08 -0800)]
media: Add new key for latency support
Test: NONE
Bug:
34221970
Change-Id: Id2d64f9be6bffaff1897079b5132388046882334
TreeHugger Robot [Mon, 27 Feb 2017 18:04:01 +0000 (18:04 +0000)]
Merge "Move the lock item for the QS WifiPicker."
Bryce Lee [Mon, 27 Feb 2017 17:51:02 +0000 (17:51 +0000)]
Merge "Remove activity from task if not set properly."
Andrei Stingaceanu [Mon, 27 Feb 2017 17:42:14 +0000 (17:42 +0000)]
Merge "AutoSize TextView (part 11) - fix final APIs"
TreeHugger Robot [Mon, 27 Feb 2017 17:39:59 +0000 (17:39 +0000)]
Merge "Exit touch mode on mouse/stylus click"
Hakan Seyalioglu [Tue, 13 Dec 2016 23:23:22 +0000 (15:23 -0800)]
Push chooser targets to the shortcut manager.
More info at go/direct-share-push
Test: Some basic testing currently in, more to be added.
Change-Id: I069f9779988c3eca2c4d8b83ec62501983854355
TreeHugger Robot [Mon, 27 Feb 2017 17:33:32 +0000 (17:33 +0000)]
Merge "Implicitly cast views obtained via View.findView methods"
TreeHugger Robot [Mon, 27 Feb 2017 17:31:19 +0000 (17:31 +0000)]
Merge "Fix build using ANDROID_COMPILE_WITH_JACK=false"
Winson Chung [Mon, 27 Feb 2017 17:23:44 +0000 (17:23 +0000)]
Merge "Fixing regression when going to fullscreen from PiP."
TreeHugger Robot [Mon, 27 Feb 2017 17:19:06 +0000 (17:19 +0000)]
Merge "Make Half look like and behave like a boxed instance"
Paul Lawrence [Mon, 27 Feb 2017 16:55:43 +0000 (16:55 +0000)]
Merge "Revert "Move seccomp policy logic to bionic"" am:
4ebce43b37 am:
a853184575
am:
8084e15ad6
Change-Id: I1bd484bad3b6c51f60a12e6d8568b8928ef643e0
Dave Schaefer [Wed, 8 Feb 2017 19:26:08 +0000 (11:26 -0800)]
AccessPoint - Add Builder; Add unit tests for compareTo()
Add a Builder class to make testing easy and clean.
Add unit tests to enforce the sorting order that we want.
Refactor some compareTo() internals to use existing methods rather than
duplicating functionality.
Refactor isReachable() functionality to a new method.
Update tests to use Truth assertion library.
Test: Run local AccessPoint unit tests:
adb shell am instrument -w -e class
com.android.settingslib.wifi.AccessPointTest
com.android.settingslib/android.support.test.runner.AndroidJUnitRunner
Bug:
35042429
Change-Id: I7c8a1ca69800f62e1fb13141e58b4e52b2bc3d70
Paul Lawrence [Mon, 27 Feb 2017 16:51:06 +0000 (16:51 +0000)]
Merge "Revert "Move seccomp policy logic to bionic"" am:
4ebce43b37
am:
a853184575
Change-Id: I311f326743a9945eec04aebafaadbf6b64e06fe3
Jerome Gaillard [Mon, 27 Feb 2017 16:48:34 +0000 (16:48 +0000)]
Merge "Add stroke width property used by animated vector drawables"
Paul Lawrence [Mon, 27 Feb 2017 16:47:12 +0000 (16:47 +0000)]
Merge "Revert "Move seccomp policy logic to bionic""
am:
4ebce43b37
Change-Id: I276412507fcb3ef577931e7406964fd7040615c7
TreeHugger Robot [Mon, 27 Feb 2017 16:39:52 +0000 (16:39 +0000)]
Merge "Make IKeyChainAliasCallback oneway"
Paul Lawrence [Mon, 27 Feb 2017 16:39:11 +0000 (16:39 +0000)]
Merge "Revert "Move seccomp policy logic to bionic""
Paul Lawrence [Mon, 27 Feb 2017 16:32:10 +0000 (16:32 +0000)]
Revert "Move seccomp policy logic to bionic"
This reverts commit
48c30ef529543c9bbd1b55f9e05c666b3ffeb7c6.
Reverting build-breaking change
Change-Id: Iad6270e51cb1ead0efbd52c2dfcc6d2118931e4e
Paul Lawrence [Mon, 27 Feb 2017 16:28:22 +0000 (16:28 +0000)]
Merge "Move seccomp policy logic to bionic" am:
7ed4ca9032 am:
d97791e74f
am:
1a6a6f0277
Change-Id: I7b7398efd1479b6b5ecdaf81e9760a09e0ee9b55
Paul Lawrence [Mon, 27 Feb 2017 16:22:11 +0000 (16:22 +0000)]
Merge "Move seccomp policy logic to bionic" am:
7ed4ca9032
am:
d97791e74f
Change-Id: I12c1efaa13d3998fc9fb22ec08df4a12bf29c3c8
Paul Lawrence [Mon, 27 Feb 2017 16:15:38 +0000 (16:15 +0000)]
Merge "Move seccomp policy logic to bionic"
am:
7ed4ca9032
Change-Id: I744d6c4545edd9d221deb79bbbeea83d459e3161
Paul Lawrence [Mon, 27 Feb 2017 16:09:39 +0000 (16:09 +0000)]
Merge "Move seccomp policy logic to bionic"
Alan Viverette [Mon, 27 Feb 2017 15:57:58 +0000 (10:57 -0500)]
Implicitly cast views obtained via View.findView methods
Removes all explicit casts from android.widget classes. Also @removes
methods on ListView that were overriding @hidden methods and should
never have been exposed as public API.
Bug:
24137209
Test: make
Change-Id: I89f0e51258560987b3942251fd249210f825ac2a
Justin Klaassen [Mon, 27 Feb 2017 15:46:51 +0000 (07:46 -0800)]
Fix build using ANDROID_COMPILE_WITH_JACK=false
services/core/.../wm/WindowManagerService.java:5175:
error: cannot find symbol
final class H extends Handler {
Bug:
32709235
Test: lunch aosp_x86-eng && make -j32 ANDROID_COMPILE_WITH_JACK=false
Change-Id: I8c5990cf5a244cc2cc784673225397f9d1a74923
Todd Kennedy [Mon, 27 Feb 2017 15:34:35 +0000 (07:34 -0800)]
don't call settings provider with pkg mgr lock
Bug:
34739922
Test: manual
Change-Id: I8bd5ad76d1db5125d75c086b7f0aa24b7ac3919a
Bryce Lee [Thu, 23 Feb 2017 00:39:06 +0000 (16:39 -0800)]
Remove activity from task if not set properly.
We do not start an activity in the case of a lock task mode
violation. However, the activity is still associated with the task
and therefore participates in future interactions, such as
visibility checks.
This changelist addresses this issue by removing the assocation in
the case of failures.
Change-Id: I77692465cb1082478528771fd6fd844fab62f697
Fixes:
35034729
Fixes:
35035258
Fixes:
34179495
Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testLockTask_deviceOwnerUser
Andrei Stingaceanu [Mon, 27 Feb 2017 14:27:34 +0000 (14:27 +0000)]
AutoSize TextView (part 11) - fix final APIs
* public attr "autoSizeText" becomes "autoSizeTextType"
(inlined with all other methods and naming)
* documentation for autoSizetextType "uniform" re-worked:
"The TextView scales text size both horizontally and
vertically to fit within the container"
* converted comments into Javadoc for
TextView#AUTO_SIZE_TEXT_TYPE_NONE and
TextView#AUTO_SIZE_TEXT_TYPE_UNIFORM
* better documented attr "autoSizePresetSizes" to specify
it is a resource array of dimensions
* various small fixes in comments
Bug:
35755149
Bug:
35763485
Bug:
35764658
Bug:
32221168
Test: run cts-dev -m CtsWidgetTestCases -t \
android.widget.cts.TextViewTest
Change-Id: I36afd399e005521b6e85922aa9e1e4418bb960e1
Jorim Jaggi [Mon, 27 Feb 2017 15:04:24 +0000 (16:04 +0100)]
Update paint filer when updating thumbnail
Test: Enable task snapshots, go to recents, scroll, make sure no
jump in darkness of thumbnail
Change-Id: I5448192bd87259eb8a4e1e7b7c55c1aa82693d2e
Jerome Gaillard [Mon, 27 Feb 2017 14:44:46 +0000 (14:44 +0000)]
Add stroke width property used by animated vector drawables
This is for example used in displaying a checked radio button.
Test: Modified widget render test to include a checked radio button
Change-Id: I43074ce038f69f28c0cf5fb396d393722b02b142
Jorim Jaggi [Mon, 27 Feb 2017 14:22:25 +0000 (14:22 +0000)]
Merge "Fix sharing bugreports from lockscreen"
Jason Monk [Fri, 24 Feb 2017 21:57:40 +0000 (16:57 -0500)]
Provide some compatibility story for devs in the past
They should be providing themes when resolving certain resources,
but they aren't anyway, so try to provide it free of charge, when
possible. Also, nothing is ever free.
Test: Open app that uses old/bad resource methods
Change-Id: Icd57aadf1202ddffb1dd73ab45119fae7e5d6130
Fixes:
35656110
Seigo Nonaka [Mon, 27 Feb 2017 04:30:27 +0000 (04:30 +0000)]
Merge "Follow Minikin's signature changes."
Tyler Gunn [Mon, 27 Feb 2017 03:10:57 +0000 (03:10 +0000)]
Merge "Fix videoStateToString for audio/paused state." am:
89e7a888be am:
2f96f34373
am:
9b59cc7bad
Change-Id: Idee131069636fc8a4ea086a3d41bce4c1dfcbda6
Tyler Gunn [Mon, 27 Feb 2017 03:05:28 +0000 (03:05 +0000)]
Merge "Format Japanese numbers using national format when in Japan." am:
050e5ddb4f am:
8ac499fbe6
am:
a84292c9d7
Change-Id: I770af0bba538268797295f59c8675191a6ef41a6
Tyler Gunn [Mon, 27 Feb 2017 03:05:21 +0000 (03:05 +0000)]
Merge "Fix videoStateToString for audio/paused state." am:
89e7a888be
am:
2f96f34373
Change-Id: Ia14b054be24acc2a767707b72a12902460cd11e7
Tyler Gunn [Mon, 27 Feb 2017 03:01:08 +0000 (03:01 +0000)]
Merge "Fix videoStateToString for audio/paused state."
am:
89e7a888be
Change-Id: I04fe4d5b61c548f3b5f012af343c4e08334933e0
Tyler Gunn [Mon, 27 Feb 2017 02:59:21 +0000 (02:59 +0000)]
Merge "Format Japanese numbers using national format when in Japan." am:
050e5ddb4f
am:
8ac499fbe6
Change-Id: Ied615fbaf689a931a2b93785d944f2a8bd7f49dd
Tyler Gunn [Mon, 27 Feb 2017 02:55:24 +0000 (02:55 +0000)]
Merge "Fix videoStateToString for audio/paused state."
Tyler Gunn [Mon, 27 Feb 2017 02:54:49 +0000 (02:54 +0000)]
Merge "Format Japanese numbers using national format when in Japan."
am:
050e5ddb4f
Change-Id: I996a79c2b3158e1fd6999330e0b0b21f8e4c8b4b
Tyler Gunn [Mon, 27 Feb 2017 02:48:10 +0000 (02:48 +0000)]
Merge "Format Japanese numbers using national format when in Japan."
Seigo Nonaka [Fri, 10 Feb 2017 07:53:31 +0000 (16:53 +0900)]
Follow Minikin's signature changes.
Minikin now uses shared_ptr instead of MinikinRefCounted.
Bug:
28119474
Test: manually tested
Test: hwui_unit_tests passed.
Change-Id: Ie0564851a8a798af112679e15f7a07db000a977e
Jeff Sharkey [Mon, 27 Feb 2017 01:45:40 +0000 (01:45 +0000)]
Merge "Delete @removed APIs that never shipped."
Romain Guy [Sat, 25 Feb 2017 02:44:12 +0000 (18:44 -0800)]
Make Half look like and behave like a boxed instance
Bug:
35765416
Test: HalfTest
Change-Id: I7ef52428f8b4e2c05b91d7eb37cc4cb5ecc5c6b9
Andy Hung [Sun, 26 Feb 2017 07:04:35 +0000 (07:04 +0000)]
Merge changes I21b77905,Ia98ec539
* changes:
VolumeShaper: Use VolumeAutomation interface and unhide
VolumeShaper: Remove PlayerProxy constructor
TreeHugger Robot [Sun, 26 Feb 2017 04:39:08 +0000 (04:39 +0000)]
Merge "Catch all exceptions thrown by the interfaces."
Jack Yu [Sat, 25 Feb 2017 06:16:51 +0000 (06:16 +0000)]
resolve merge conflicts of
e091985bb5b5 to stage-aosp-master am:
82c46d11f6
am:
9080d6708d -s ours
Change-Id: I112682c76b21e0cc646026e6ec2f3b883023427c
Jack Yu [Sat, 25 Feb 2017 04:58:12 +0000 (04:58 +0000)]
resolve merge conflicts of
e091985bb5b5 to stage-aosp-master
am:
82c46d11f6
Change-Id: I2b6b5f698d03c86957fdaf4f73e26dfe36758924
TreeHugger Robot [Sat, 25 Feb 2017 04:17:28 +0000 (04:17 +0000)]
Merge "Strip out some logics from ESP to FSP that DSP can use."
TreeHugger Robot [Sat, 25 Feb 2017 03:41:12 +0000 (03:41 +0000)]
Merge "Do not set tooltips on items in list-based menus."
Andy Hung [Fri, 24 Feb 2017 00:21:13 +0000 (16:21 -0800)]
VolumeShaper: Use VolumeAutomation interface and unhide
Test: Ducking and CTS
Bug:
31015569
Change-Id: I21b77905e86bf336c05aad5378f33ff36a92b3b5
Andy Hung [Wed, 22 Feb 2017 20:34:21 +0000 (12:34 -0800)]
VolumeShaper: Remove PlayerProxy constructor
Use of the VolumeShaper through PlayerProxy requires system ids,
which is different enough from PlayerBase that we don't allow
direct construction.
Test: Ducking
Bug:
31015569
Change-Id: Ia98ec5396047ae39e78237bb7e485d07f2eb1efd
TreeHugger Robot [Sat, 25 Feb 2017 02:57:50 +0000 (02:57 +0000)]
Merge "Implement reset to original selection."
Jack Yu [Sat, 25 Feb 2017 02:46:58 +0000 (18:46 -0800)]
resolve merge conflicts of
e091985bb5b5 to stage-aosp-master
Test: Manual
Change-Id: Icaf4663abd3ad233afa3e31ff1939dbb7c07a2a5
TreeHugger Robot [Sat, 25 Feb 2017 02:45:51 +0000 (02:45 +0000)]
Merge "Add CIECAT02 chromatic adaptation transform"
TreeHugger Robot [Sat, 25 Feb 2017 02:31:43 +0000 (02:31 +0000)]
Merge "Process the NetworkInfo before updating AccessPoints."
Garfield Tan [Wed, 8 Feb 2017 23:32:56 +0000 (15:32 -0800)]
Strip out some logics from ESP to FSP that DSP can use.
Also notify MediaStore when move happens.
Test: build & smoke tested.
Change-Id: I01576765c0b25089a81b77ce0904abea8b24d485
TreeHugger Robot [Sat, 25 Feb 2017 01:44:56 +0000 (01:44 +0000)]
Merge "Refactored savableIds() into a SaveInfo class."
Robin Lee [Sat, 25 Feb 2017 01:28:25 +0000 (01:28 +0000)]
Make IKeyChainAliasCallback oneway
So it can be sent from devicepolicymanager (system_server) to keychain
(a system_app) without waiting on the response and having to do
everything in a background thread.
Side-effect: the regular keychain => app callback is slightly more
efficient now too. in case anyone particularly needs blazing fast
private key user selections.
Fix:
35675253
Test: cts-tradefed run cts --abi=arm64-v8a --skip-device-info --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.DeviceOwnerTest#testKeyManagement' </dev/null 2>&1
Change-Id: I6e9d96ca3c42e6489d879d8cfb0507eb94838bf1
Chen Xu [Sat, 25 Feb 2017 01:24:27 +0000 (01:24 +0000)]
Merge "move ACTION_CARRIER_SETUP intent to public api" am:
fcb37ffc60 am:
f4854018a2
am:
9897cc4369 -s ours
Change-Id: Ie96a60472c7d7f0fb8e70e535745d849bfc3f68c
TreeHugger Robot [Sat, 25 Feb 2017 01:19:14 +0000 (01:19 +0000)]
Merge "Add logging constants for setting build number preference."
Chen Xu [Sat, 25 Feb 2017 01:17:31 +0000 (01:17 +0000)]
Merge "move ACTION_CARRIER_SETUP intent to public api" am:
fcb37ffc60
am:
f4854018a2
Change-Id: Ie9ff472da7912042ec969268dd46d1b9a404526c
Makoto Onuki [Sat, 25 Feb 2017 01:15:31 +0000 (01:15 +0000)]
Merge "Don't include Bitmaps in activity intents"
Robin Lee [Sat, 25 Feb 2017 01:15:19 +0000 (01:15 +0000)]
Remove tint from network logging icon
Mirrors the change in commit
3250885c9feb9b42d60058a823c57a027c0dcf58
("Visual refresh for QS") which removed tint from all ic_qs_xyz.xml
icons for quicksettings.
This one was missed because it was committed to nougat-mr2-dev and
only merged into the development branch afterwards.
Change-Id: I603c31aa82e9d52925fbe06d02a620036d93056e
Fix:
35620542
Test: adb shell am start 'android.app.action.SHOW_DEVICE_MONITORING_DIALOG' on a device with network logging enabled.
Treehugger Robot [Sat, 25 Feb 2017 01:13:28 +0000 (01:13 +0000)]
Merge "Added a settings for CMAS message broadcast"
Chen Xu [Sat, 25 Feb 2017 01:12:09 +0000 (01:12 +0000)]
Merge "move ACTION_CARRIER_SETUP intent to public api"
am:
fcb37ffc60
Change-Id: Iaa09a2c35a88d58a6c6df4122bf7f1f87bd7075e
Chen Xu [Sat, 25 Feb 2017 01:05:30 +0000 (01:05 +0000)]
Merge "move ACTION_CARRIER_SETUP intent to public api"
Amith Yamasani [Sat, 25 Feb 2017 00:58:58 +0000 (00:58 +0000)]
Merge "Reduce screen on delay during UsageStats rollover"
Sundeep Ghuman [Thu, 23 Feb 2017 02:17:29 +0000 (18:17 -0800)]
Process the NetworkInfo before updating AccessPoints.
This fixes a UI issue where the Tracker first displays the connected
accessPoint as inactive before processing the connected state, which
causes the list to jump around.
Also add useful debugging information to AccessPoint toString.
Bug:
35681450
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I9a8356cfdd2e5be2da58ce5de82e228fddf301f9
TreeHugger Robot [Sat, 25 Feb 2017 00:55:56 +0000 (00:55 +0000)]
Merge "Fix VR current component changes being ignored."
Winson Chung [Sat, 25 Feb 2017 00:47:37 +0000 (16:47 -0800)]
Fixing regression when going to fullscreen from PiP.
- Just ensure that we don't resize the stack if it's already not
visible.
Bug:
35338156
Test: Enter/exit pip on TV
Change-Id: I0bd234dd18ecd3d7d4cb37edad9f1fb3053d96bb
TreeHugger Robot [Sat, 25 Feb 2017 00:41:06 +0000 (00:41 +0000)]
Merge changes Ib32aca72,I201f081e
* changes:
Bind to the recommendation service specified in the Setting.
Move NetworkScorerAppManager into com.android.server.