OSDN Git Service
Android Build Merger (Role) [Fri, 7 Apr 2017 03:11:58 +0000 (03:11 +0000)]
Merge "Merge "NetworkMonitor: improve captive portal validation logs" am:
d6933a6c14 am:
deb64ea13e am:
bdebc29751" into oc-dev-plus-aosp
Hugo Benichi [Fri, 7 Apr 2017 03:11:09 +0000 (03:11 +0000)]
Merge "NetworkMonitor: improve captive portal validation logs" am:
d6933a6c14 am:
deb64ea13e
am:
bdebc29751
Change-Id: I6ce46b76d20d8cad5badb5fd3714c42a70988a06
Felipe Leme [Fri, 7 Apr 2017 03:08:25 +0000 (03:08 +0000)]
Merge "Who wants...to live...forever? The "Save for Autofill?" dialog does!" into oc-dev
am:
53b6f00dc5
Change-Id: I553c58613ea0b1ee933a40f5bcbf6c0c49c8b2dd
Amith Yamasani [Fri, 7 Apr 2017 03:06:50 +0000 (03:06 +0000)]
Merge "Log excessive remote callbacks" into oc-dev
am:
6c171f35be
Change-Id: I9c1703a6c9cff68ee5262c91380c4647a2a79812
Hugo Benichi [Fri, 7 Apr 2017 03:03:41 +0000 (03:03 +0000)]
Merge "NetworkMonitor: improve captive portal validation logs" am:
d6933a6c14
am:
deb64ea13e
Change-Id: I8d9304663e8b5019b65bf048cc7a72e6e9e43043
Calin Juravle [Fri, 7 Apr 2017 03:01:45 +0000 (03:01 +0000)]
Merge "Check for a null packageInfo before notifying about app install" into oc-dev
am:
1fd46de245
Change-Id: Ie5591a52e947af61fc04a2b1f64a2fe370f5e657
TreeHugger Robot [Fri, 7 Apr 2017 03:00:01 +0000 (03:00 +0000)]
Merge "Who wants...to live...forever? The "Save for Autofill?" dialog does!" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 02:58:50 +0000 (02:58 +0000)]
Merge "Log excessive remote callbacks" into oc-dev
Hugo Benichi [Fri, 7 Apr 2017 02:56:11 +0000 (02:56 +0000)]
Merge "NetworkMonitor: improve captive portal validation logs"
am:
d6933a6c14
Change-Id: I8f0fd26d6a9f036adc9cc895690aac27d4b8e9cd
Calin Juravle [Fri, 7 Apr 2017 02:53:19 +0000 (02:53 +0000)]
Merge "Check for a null packageInfo before notifying about app install" into oc-dev
Treehugger Robot [Fri, 7 Apr 2017 02:48:55 +0000 (02:48 +0000)]
Merge "NetworkMonitor: improve captive portal validation logs"
Casey Burkhardt [Fri, 7 Apr 2017 02:45:28 +0000 (02:45 +0000)]
Merge "Revise Accessibility button chooser intent/permissions" into oc-dev
am:
ecb5b5ccc3
Change-Id: I7aa9a6760ff74e35875aa24e86f88dc72603075b
Casey Burkhardt [Fri, 7 Apr 2017 02:40:11 +0000 (02:40 +0000)]
Merge "Revise Accessibility button chooser intent/permissions" into oc-dev
Android Build Merger (Role) [Fri, 7 Apr 2017 02:38:23 +0000 (02:38 +0000)]
Merge "Merge "ConnectivityService: safer locking" am:
b8dc7fbc6d am:
b960ee662c am:
f0928412b0" into oc-dev-plus-aosp
Hugo Benichi [Fri, 7 Apr 2017 02:37:44 +0000 (02:37 +0000)]
Merge "ConnectivityService: safer locking" am:
b8dc7fbc6d am:
b960ee662c
am:
f0928412b0
Change-Id: If83fae5f70cb2e253a4107591f43d9ce2d648006
Chad Brubaker [Fri, 7 Apr 2017 02:37:36 +0000 (02:37 +0000)]
Merge "Add UPDATE_TZDATA to config updater intents" into oc-dev
am:
c56d782e13
Change-Id: I14d241e63ead50651ca21aa1d28bce3ba019b5fc
Hugo Benichi [Fri, 7 Apr 2017 02:29:44 +0000 (02:29 +0000)]
Merge "ConnectivityService: safer locking" am:
b8dc7fbc6d
am:
b960ee662c
Change-Id: If4985a8d51c03ea6cc3be121962bbf27f980fdc7
TreeHugger Robot [Fri, 7 Apr 2017 02:28:19 +0000 (02:28 +0000)]
Merge "Add UPDATE_TZDATA to config updater intents" into oc-dev
Hugo Benichi [Fri, 7 Apr 2017 02:21:41 +0000 (02:21 +0000)]
Merge "ConnectivityService: safer locking"
am:
b8dc7fbc6d
Change-Id: I88a118bb59f8a870d42d2d665f838f5236ebd21c
Hugo Benichi [Fri, 7 Apr 2017 02:10:45 +0000 (02:10 +0000)]
Merge "ConnectivityService: safer locking"
Jason Monk [Fri, 7 Apr 2017 01:49:16 +0000 (01:49 +0000)]
Merge "Tuner plugin settings updates" into oc-dev
am:
eaf6b3b193
Change-Id: If20613b2a78c70b073b00dfc33bd832e3c4b5dc9
Jason Monk [Fri, 7 Apr 2017 01:39:25 +0000 (01:39 +0000)]
Merge "Tuner plugin settings updates" into oc-dev
Steven Moreland [Fri, 7 Apr 2017 01:29:42 +0000 (01:29 +0000)]
Merge "Use hwservicemanager getTransport." am:
562ed84ff4 am:
9912ec4ca6
am:
ea377a967f -s ours
Change-Id: Idb0e7c9d95ade65922241316fe1c75b5cee56d98
Steven Moreland [Fri, 7 Apr 2017 01:24:38 +0000 (01:24 +0000)]
Merge "Use hwservicemanager getTransport." am:
562ed84ff4
am:
9912ec4ca6
Change-Id: I08c33de1eb82b6717b4a9d4d76211dd0fa638d52
Tima Vaisburd [Fri, 7 Apr 2017 01:24:36 +0000 (01:24 +0000)]
Merge "Added onMovedToDisplay method to WebView" into oc-dev
am:
be41b61216
Change-Id: Ib119a90509998347b6ad26862ddfdb2d5299fb42
TreeHugger Robot [Fri, 7 Apr 2017 01:18:55 +0000 (01:18 +0000)]
Merge "Added onMovedToDisplay method to WebView" into oc-dev
Steven Moreland [Fri, 7 Apr 2017 01:18:36 +0000 (01:18 +0000)]
Merge "Use hwservicemanager getTransport."
am:
562ed84ff4
Change-Id: I39ee473166dce391f3cad4acf62821a4dfb9f444
Steven Moreland [Fri, 7 Apr 2017 01:10:56 +0000 (01:10 +0000)]
Merge "Use hwservicemanager getTransport."
Felipe Leme [Fri, 7 Apr 2017 01:03:39 +0000 (18:03 -0700)]
Who wants...to live...forever? The "Save for Autofill?" dialog does!
Fixes:
37083017
Test: manual verification
Test: CtsAutoFillServiceTestCases pass
Change-Id: Id177fb59810956e4b43c1d357de415d64ab9d89a
Hugo Benichi [Thu, 6 Apr 2017 05:36:39 +0000 (14:36 +0900)]
NetworkMonitor: improve captive portal validation logs
This patch adds probe type and url to all validation logs about web
probes sent for captive portal detection.
Test: built, flashed, looked at $ adb shell dumpsys connectivity
Bug:
36830206,
36532213
Change-Id: Iee2caaf6664f3d097f9d1888ccc5fece0a95994c
Jason Monk [Fri, 7 Apr 2017 00:45:35 +0000 (00:45 +0000)]
Merge "Add metrics for nav buttons through KeyButtonView" into oc-dev
am:
809b79da2f
Change-Id: I1e66207bb9c5fc882f3a8b41e44a6f85d894401b
Adrian Roos [Fri, 7 Apr 2017 00:39:42 +0000 (00:39 +0000)]
Merge "NotiViewWrapper: Fix test that breaks on master" into oc-dev
am:
ad27aa11b1
Change-Id: I4a74e401b9c4cdaeb0b27919b03e24b88855edb8
TreeHugger Robot [Fri, 7 Apr 2017 00:39:27 +0000 (00:39 +0000)]
Merge "Add metrics for nav buttons through KeyButtonView" into oc-dev
Calin Juravle [Fri, 7 Apr 2017 00:38:23 +0000 (00:38 +0000)]
Merge "Reconcile secondary dex paths when compiling with adb shell cmd..." into oc-dev
am:
d34076385d
Change-Id: I498941457eba58e39d1a57238ed3c7e66cb278e3
Calin Juravle [Fri, 7 Apr 2017 00:36:20 +0000 (00:36 +0000)]
Merge "Pass SElinux info to installd dexopt" into oc-dev
am:
31762dd9a0
Change-Id: Ifd344ec8396ebbd62940522e259ddc72b6e4f1c0
Andrii Kulian [Fri, 7 Apr 2017 00:32:24 +0000 (00:32 +0000)]
Merge "Add system config to specify Multi-Display support" into oc-dev
am:
ff15be677b
Change-Id: Ib6e89adaaf759545efb050a599519eb3105754f1
TreeHugger Robot [Fri, 7 Apr 2017 00:26:30 +0000 (00:26 +0000)]
Merge "NotiViewWrapper: Fix test that breaks on master" into oc-dev
Phil Weaver [Fri, 7 Apr 2017 00:25:38 +0000 (00:25 +0000)]
Merge "Fix crash when using list of enabled a11y services" into oc-dev
am:
3879a39ee6
Change-Id: Ifa3acdc07c4b9420fbb421587432b0c0aae203a2
Calin Juravle [Fri, 7 Apr 2017 00:24:21 +0000 (00:24 +0000)]
Merge "Reconcile secondary dex paths when compiling with adb shell cmd..." into oc-dev
Calin Juravle [Fri, 7 Apr 2017 00:23:43 +0000 (00:23 +0000)]
Merge "Pass SElinux info to installd dexopt" into oc-dev
Andrii Kulian [Fri, 7 Apr 2017 00:22:37 +0000 (00:22 +0000)]
Merge "Add system config to specify Multi-Display support" into oc-dev
William Luh [Fri, 7 Apr 2017 00:09:34 +0000 (00:09 +0000)]
Merge "Fix injected settings titles not matching a locale change." into oc-dev
am:
1b54760eee
Change-Id: Icdeb7d2e65a0c6061b773765cb6470684d24c5b2
TreeHugger Robot [Fri, 7 Apr 2017 00:08:20 +0000 (00:08 +0000)]
Merge "Fix crash when using list of enabled a11y services" into oc-dev
William Luh [Fri, 7 Apr 2017 00:00:40 +0000 (00:00 +0000)]
Merge "Fix injected settings titles not matching a locale change." into oc-dev
Patrik Torstensson [Thu, 6 Apr 2017 23:41:03 +0000 (23:41 +0000)]
Merge "SurfaceControl: Crash due to invalid JNI cast" into oc-dev
am:
34cb00ac83
Change-Id: I2871b1f3edbf24c3a5b1ef49d432f5394198e6d7
Amith Yamasani [Thu, 6 Apr 2017 17:29:33 +0000 (10:29 -0700)]
Log excessive remote callbacks
Bug:
36778087
Test: N/A
Change-Id: Ifb02fe09e3c0869f7f6c741f886421064e5c1b8a
TreeHugger Robot [Thu, 6 Apr 2017 23:35:31 +0000 (23:35 +0000)]
Merge "SurfaceControl: Crash due to invalid JNI cast" into oc-dev
Joel Fernandes [Thu, 6 Apr 2017 22:57:31 +0000 (22:57 +0000)]
Merge "Set android.display thread to top-app cpusets and schedtune group" into oc-dev
am:
5362f10dad
Change-Id: I4993d49f7bcf9606e7676b17f7dacbc0e457e061
Dongwon Kang [Thu, 6 Apr 2017 22:56:24 +0000 (22:56 +0000)]
Merge "Add intent to intialize programs on APP installed" into oc-dev
am:
9c1e85384e
Change-Id: I806f2287b78670d3bcb8eef05c37e4581ad68985
TreeHugger Robot [Thu, 6 Apr 2017 22:51:38 +0000 (22:51 +0000)]
Merge "Set android.display thread to top-app cpusets and schedtune group" into oc-dev
Tima Vaisburd [Thu, 6 Apr 2017 22:50:05 +0000 (15:50 -0700)]
Added onMovedToDisplay method to WebView
Delegate the action to WebViewProvider, by default it is no-op.
Bug:
36006397
Test: There is no implementation yet to test.
Change-Id: Ib5101d3669a92ae81cfb34cc5db607c374712a3d
Dongwon Kang [Thu, 6 Apr 2017 22:49:46 +0000 (22:49 +0000)]
Merge "Add intent to intialize programs on APP installed" into oc-dev
Felipe Leme [Thu, 6 Apr 2017 22:48:35 +0000 (22:48 +0000)]
Merge "Don't start a partition when session is pending FillResponse authentication." into oc-dev
am:
6f5db9a2a8
Change-Id: If5cbb0c7b3617f66aa823859af971358f1c01ccf
TreeHugger Robot [Thu, 6 Apr 2017 22:41:59 +0000 (22:41 +0000)]
Merge "Don't start a partition when session is pending FillResponse authentication." into oc-dev
Adrian Roos [Wed, 5 Apr 2017 20:59:15 +0000 (13:59 -0700)]
NotiViewWrapper: Fix test that breaks on master
oc-dev allows constructing views with a null context, but
that doesn't work any longer on master.
Bug:
36430936
Change-Id: If069f81d54e3e3b9145ca5187b87888cd6173c0f
Merged-In: If069f81d54e3e3b9145ca5187b87888cd6173c0f
Wale Ogunwale [Thu, 6 Apr 2017 22:40:35 +0000 (22:40 +0000)]
Merge "Preserve app window when it requests a relaunch" into oc-dev
am:
9e96ecfe9c
Change-Id: I871a8a09eaa25898e4de0a6dc1155bfe02e52f10
jackqdyulei [Thu, 6 Apr 2017 22:39:20 +0000 (22:39 +0000)]
Merge "Add lower case charging string." into oc-dev
am:
e263940142
Change-Id: Iad64dbd0b57028e2a5567c81bb86152cdb6d17a4
TreeHugger Robot [Thu, 6 Apr 2017 22:32:35 +0000 (22:32 +0000)]
Merge "Preserve app window when it requests a relaunch" into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 22:30:45 +0000 (22:30 +0000)]
Merge "Add lower case charging string." into oc-dev
Felipe Leme [Thu, 6 Apr 2017 22:30:09 +0000 (22:30 +0000)]
Merge "Removed deprecated onFillRequest() method" into oc-dev
am:
7a7c0ace82
Change-Id: I538be771db63f10a6383495147c32848fabe55cd
Steven Moreland [Thu, 6 Apr 2017 22:28:30 +0000 (22:28 +0000)]
Merge "Use hwservicemanager getTransport." into oc-dev
am:
610b55e8bc
Change-Id: I38941d30137bc8ff525d8acc9a4cd04d5d59d975
Steven Moreland [Thu, 6 Apr 2017 16:28:32 +0000 (09:28 -0700)]
Use hwservicemanager getTransport.
libhidl no longer provides a getTransport function. Now, call into the
hwservicemanager which directly interfaces with libvintf.
Test: extensive, see Ia5d1eb41b057ab5d6800f6c3fd22658adecc4be7
Bug:
36377072
Merged-In: I8b0ca845251cd7cd156f3471cbd4b0ce17617be0
Change-Id: I8b0ca845251cd7cd156f3471cbd4b0ce17617be0
(cherry picked from commit
f8202e464e09618c2b780d331541f32cc186598e)
TreeHugger Robot [Thu, 6 Apr 2017 22:20:45 +0000 (22:20 +0000)]
Merge "Removed deprecated onFillRequest() method" into oc-dev
Jason Monk [Fri, 31 Mar 2017 19:42:27 +0000 (15:42 -0400)]
Add metrics for nav buttons through KeyButtonView
Doesn't cover home-long-press or overview, but those appear to be
covered by other events.
Test: runtest systemui
Merged-In: I590b52765aaef3c2bf573ce8ab980aa992b1d5b0
Change-Id: I630356245e223a3fb8d4d2fe11be5d498227c0e3
Fixes:
25931698
jackqdyulei [Thu, 6 Apr 2017 22:17:47 +0000 (22:17 +0000)]
Merge "Add showChargingMethod in BatteryInfo" into oc-dev
am:
5883a40931
Change-Id: Ic110cc08f3bcd4720210744531703e0be15c9371
Sudheer Shanka [Thu, 6 Apr 2017 22:16:43 +0000 (22:16 +0000)]
Merge "Add tests for verifying network availability on activity start." into oc-dev
am:
e78467f671
Change-Id: I100f167996514b985e6aa2b3767b75cf41d7539e
TreeHugger Robot [Thu, 6 Apr 2017 22:15:04 +0000 (22:15 +0000)]
Merge "Use hwservicemanager getTransport." into oc-dev
Sudheer Shanka [Thu, 6 Apr 2017 22:14:48 +0000 (22:14 +0000)]
Merge "Fix testWaitForNetworkStateUpdate." into oc-dev
am:
d17ebaba9a
Change-Id: I80c1b94e2ef6bdc02209ed6a2b7f388f926c9c06
TreeHugger Robot [Thu, 6 Apr 2017 22:06:21 +0000 (22:06 +0000)]
Merge "Add showChargingMethod in BatteryInfo" into oc-dev
Sudheer Shanka [Thu, 6 Apr 2017 22:06:14 +0000 (22:06 +0000)]
Merge "Add tests for verifying network availability on activity start." into oc-dev
Sudheer Shanka [Thu, 6 Apr 2017 22:05:51 +0000 (22:05 +0000)]
Merge "Fix testWaitForNetworkStateUpdate." into oc-dev
Romain Guy [Thu, 6 Apr 2017 21:39:20 +0000 (21:39 +0000)]
Merge "Rename getIntent() to getRenderIntent()" into oc-dev
am:
b2bb3bf268
Change-Id: I10652933266e3eb976244de9e7b1ddeab4fe7c87
William Luh [Fri, 31 Mar 2017 22:08:16 +0000 (15:08 -0700)]
Fix injected settings titles not matching a locale change.
The injected tiles code currently treats the string metadata value
for the title key in the Activity's manifest as the title itself.
When the language on the device is changed the title remains in the
previous language until a reboot.
This CL will make injected tiles attempt to treat the string metadata
value as a resource variable to get the integer res id and then
properly load the localized title using the res id. To be backwards
compatible, if the res id is 0, we treat the string metadata value as
the title itself (current behavior).
Bug:
36470694
Test: make RunSettingsLibRoboTests
Change-Id: I3963534a3a3a27d0455c4ed1ad4fa574b03d67fc
TreeHugger Robot [Thu, 6 Apr 2017 21:34:13 +0000 (21:34 +0000)]
Merge "Rename getIntent() to getRenderIntent()" into oc-dev
Romain Guy [Thu, 6 Apr 2017 21:30:17 +0000 (21:30 +0000)]
Merge changes I6f00614d,I987eeab2 into oc-dev
am:
c273784c91
Change-Id: I732b93decc6ce9b3a846c971ff25484447ff9127
TreeHugger Robot [Thu, 6 Apr 2017 21:21:55 +0000 (21:21 +0000)]
Merge changes I6f00614d,I987eeab2 into oc-dev
* changes:
Convert 16 bit bitmaps to 8 bit on devices that do not have GLES3.0
Fix HardwareBitmapTests.testBitmapConfigFromRGB565
Roozbeh Pournader [Thu, 6 Apr 2017 21:20:03 +0000 (21:20 +0000)]
Merge "Use additions/emoji-data.txt instead of hardcoded values" into oc-dev
am:
43fed9afe4
Change-Id: I3c077353adf8040118b0610248848fe3d552a70e
Patrik Torstensson [Mon, 27 Mar 2017 14:04:11 +0000 (15:04 +0100)]
SurfaceControl: Crash due to invalid JNI cast
The (void*)buffer.get on ARM32 is 4 byte, so the calling convention
will put the argument in [sp, #12]. However, the caller actually
expects a long (the signature of gGraphicBufferClassInfo.builder),
which means it will expect it to be in [sp, #16]
Test: Tested on mtk device
Fixes:
36631082
Fixes:
36974487
Change-Id: I0f723125e612d096c0d76ca3360d895f3f23f286
(cherry picked from commit
98dd5d9a85e8911cf41dea6198d4111f737a5892)
Joel Fernandes [Tue, 4 Apr 2017 23:32:15 +0000 (16:32 -0700)]
Set android.display thread to top-app cpusets and schedtune group
android.display being in the foreground cpuset group is an issue. As
seen on M/S, during heavily CPU load it is not given core 3 even though
it might be free and causes jank. This patch adds the thread to the
top-app group to ensure it is placed on all cores during scheduling
decisions.
Doing this required a couple of changes:
- new API to set per-thread cpusets
- changes to DisplayManagerService to set the thread to top-app group
- changes to SystemServer to set the policy toward the end, as doing it
during start of the DisplayManagerService was in issue (issue being
SystemServer calls setSystemProcess.. -> setProcessGroup which overrides
the group settings for threads in the system server process, including
android.display)
Bug:
36631902
Test: Boot and make sure android.display thread is in the top-app group
Change-Id: Icc394ea0ffcf159d11728ad38de114234a29d20f
Signed-off-by: Joel Fernandes <joelaf@google.com>
(cherry picked from commit
474d311cb098e86c078c3f615e1161e2854f1847)
Roozbeh Pournader [Thu, 6 Apr 2017 21:18:57 +0000 (21:18 +0000)]
Merge "Force direction of phone number fields to (practically) LTR" into oc-dev
am:
0dc7596ee3
Change-Id: I10ad0deefcc24276c376816e8b7482f64d040023
Felipe Leme [Thu, 6 Apr 2017 21:17:45 +0000 (21:17 +0000)]
Merge "Shows a Toast when manual autofill request cannot be fulfilled." into oc-dev
am:
11d1a392f2
Change-Id: Icd09a38a7ef4942578719574004a11d695a6dc92
Roozbeh Pournader [Thu, 6 Apr 2017 21:13:22 +0000 (21:13 +0000)]
Merge "Use additions/emoji-data.txt instead of hardcoded values" into oc-dev
Roozbeh Pournader [Thu, 6 Apr 2017 21:13:01 +0000 (21:13 +0000)]
Merge "Force direction of phone number fields to (practically) LTR" into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 21:06:43 +0000 (21:06 +0000)]
Merge "Shows a Toast when manual autofill request cannot be fulfilled." into oc-dev
Philip P. Moltmann [Thu, 6 Apr 2017 20:49:53 +0000 (20:49 +0000)]
Merge "Add RecommendationPlugin for Cloud Print" am:
b2c75d062d am:
997f7cbabf
am:
41687d06f4
Change-Id: Iddb64b94c03eaf6925d9b4e161ac3c6fdd25a1b8
Philip P. Moltmann [Thu, 6 Apr 2017 20:42:50 +0000 (20:42 +0000)]
Merge "Add RecommendationPlugin for Cloud Print" am:
b2c75d062d
am:
997f7cbabf
Change-Id: I2b784f49097426922e833f102e1f28fc4dc99357
Sundeep Ghuman [Thu, 6 Apr 2017 20:40:11 +0000 (20:40 +0000)]
Merge "Update comment on why Keep is needed." into oc-dev
am:
696a83b0c7
Change-Id: I3d55f1601a6a491550f3d22fb66f4331ddad1eef
Kang Li [Thu, 6 Apr 2017 20:37:09 +0000 (20:37 +0000)]
Merge "Add a service to rank apps for ResolverActivity." into oc-dev
am:
5a0ee44ce5
Change-Id: I36f8664480f8741dd4d755cfcc3cfa95d8e3d1ba
Philip P. Moltmann [Thu, 6 Apr 2017 20:35:44 +0000 (20:35 +0000)]
Merge "Add RecommendationPlugin for Cloud Print"
am:
b2c75d062d
Change-Id: I4b018ac9763d9bf5c69d055b4a9d5ddf6dded3cb
Chad Brubaker [Thu, 6 Apr 2017 20:35:23 +0000 (13:35 -0700)]
Add UPDATE_TZDATA to config updater intents
Change-Id: I5fcd011e0ab030ebf1aa40818a05853117cc6811
Fixes:
36977046
Test: checkbuild
TreeHugger Robot [Thu, 6 Apr 2017 20:32:37 +0000 (20:32 +0000)]
Merge "Update comment on why Keep is needed." into oc-dev
Felipe Leme [Thu, 6 Apr 2017 20:27:52 +0000 (13:27 -0700)]
Don't start a partition when session is pending FillResponse authentication.
BUG:
35707731
Test: fixed testFillResponseAuthBothFields and testFillResponseAuthJustOneField
Change-Id: Ib74e46dd37feb7e5c03e40cfbe8133ace6db0709
Santos Cordon [Thu, 6 Apr 2017 20:30:08 +0000 (20:30 +0000)]
Merge "Revert "Remove SystemProperty gating-flag for virtual displays."" into oc-dev
am:
849302c0f1
Change-Id: I5eea2d35eec58ada02756f060374d2940198cbe1
TreeHugger Robot [Thu, 6 Apr 2017 20:25:42 +0000 (20:25 +0000)]
Merge "Add a service to rank apps for ResolverActivity." into oc-dev
Treehugger Robot [Thu, 6 Apr 2017 20:23:13 +0000 (20:23 +0000)]
Merge "Add RecommendationPlugin for Cloud Print"
Winson Chung [Thu, 6 Apr 2017 20:21:58 +0000 (20:21 +0000)]
Merge "Disable PiP when VR mode starts." into oc-dev
am:
d82c58abc5
Change-Id: I41849e0a00644592fd1e9d0a89a337a5a0a002fa
Jason Monk [Thu, 6 Apr 2017 20:20:41 +0000 (20:20 +0000)]
Merge "Revert "Handle case when snapshot dimensions don't match"" into oc-dev
am:
e7ac324c71
Change-Id: If7e422b1a5e7f8b94d4f338412025aa7ca526a09
jackqdyulei [Mon, 3 Apr 2017 18:31:40 +0000 (11:31 -0700)]
Add lower case charging string.
The previous charging string is "75% - Charging", this cl add lower
case string to make it "75% - charging".
Bug:
36558216
Test: Build
Change-Id: I683843de0b6cbd45bea6a465c7b6d8ee0b7c4f93
TreeHugger Robot [Thu, 6 Apr 2017 20:17:51 +0000 (20:17 +0000)]
Merge "Revert "Remove SystemProperty gating-flag for virtual displays."" into oc-dev
jackqdyulei [Fri, 24 Mar 2017 19:13:49 +0000 (12:13 -0700)]
Add showChargingMethod in BatteryInfo
This toggle is used to decide whether to show charging method.
If it is off, then "Charging over ac" will become "Charging"
Bug:
36558216
Test: RunSettingsLibRoboTests
Change-Id: I98b1f7e7b77d7ce0a7e1aae29e55a33ac79ff0d7
(cherry picked from commit
b3c33f63ed120cf4758ec67426bb45291e289fce)