OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Embms download setup" am: da5b77fa9b
Hall Liu [Thu, 8 Jun 2017 01:32:43 +0000 (01:32 +0000)]
Merge "Embms download setup" am: da5b77fa9b
am: a807ee8f1c

Change-Id: I6a78b3873814283d768c7e9a642b882bef8b11fc

7 years agoMerge "Embms download setup"
Hall Liu [Thu, 8 Jun 2017 01:26:28 +0000 (01:26 +0000)]
Merge "Embms download setup"
am: da5b77fa9b

Change-Id: I18b378fd0c999e40e3dc8cf9d1248414489880c6

7 years agoMerge "Embms download setup"
Hall Liu [Thu, 8 Jun 2017 01:20:48 +0000 (01:20 +0000)]
Merge "Embms download setup"

7 years agoMerge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp
TreeHugger Robot [Thu, 8 Jun 2017 01:08:20 +0000 (01:08 +0000)]
Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp

7 years agoMerge "Passing callingUid to internal methods" into oc-dev
Todd Kennedy [Thu, 8 Jun 2017 01:05:25 +0000 (01:05 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev
am: dacdf2e978

Change-Id: I11bcd48eb91c1f877a27f1cb06d6269aef76d3d2

7 years agoMerge "Passing callingUid to internal methods" into oc-dev
TreeHugger Robot [Thu, 8 Jun 2017 01:00:47 +0000 (01:00 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev

7 years agoMerge "Add timeout to StrictMode flash." into oc-dev
Jeff Sharkey [Thu, 8 Jun 2017 00:36:09 +0000 (00:36 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev
am: fdb3d31504

Change-Id: I13684a6c952e978eed035e8c217605469c3b8665

7 years agoMerge "Add timeout to StrictMode flash." into oc-dev
Jeff Sharkey [Thu, 8 Jun 2017 00:32:30 +0000 (00:32 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev

7 years agoMerge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
Sudheer Shanka [Thu, 8 Jun 2017 00:15:23 +0000 (00:15 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
am: f34713066e

Change-Id: I7ba4faeae53df155de0a25347efcc15974f2cc8c

7 years agoMerge "Fixed an issue where the icons had the wrong color" into oc-dev
Ian Pedowitz [Thu, 8 Jun 2017 00:10:39 +0000 (00:10 +0000)]
Merge "Fixed an issue where the icons had the wrong color" into oc-dev
am: 695f21a661

Change-Id: Id515004fae2e8ad90346ce82b334ae6f61b2c086

7 years agoMerge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
Sudheer Shanka [Thu, 8 Jun 2017 00:08:40 +0000 (00:08 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev

7 years agoMerge "Keyguard: Increase clock size" into oc-dev
Adrian Roos [Thu, 8 Jun 2017 00:00:25 +0000 (00:00 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev
am: 2ff366a39a

Change-Id: I0369da0041d3d8bf001340e7e8f88a60894c2c7d

7 years agoMerge "Fixed an issue where the icons had the wrong color" into oc-dev
Ian Pedowitz [Thu, 8 Jun 2017 00:00:16 +0000 (00:00 +0000)]
Merge "Fixed an issue where the icons had the wrong color" into oc-dev

7 years agoMerge "Keyguard: Increase clock size" into oc-dev
Adrian Roos [Wed, 7 Jun 2017 23:54:00 +0000 (23:54 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev

7 years agoMerge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
Bryce Lee [Wed, 7 Jun 2017 23:33:43 +0000 (23:33 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
am: f867733d4f

Change-Id: I7436b4e82365c2d83c1f38a856324e8e309920aa

7 years agoMerge "Remove Wifi Badges from platform." into oc-dev
Sundeep Ghuman [Wed, 7 Jun 2017 23:28:29 +0000 (23:28 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev
am: 09d06437ad

Change-Id: I939b42d12919635ddac9bdf91a17323f154001a9

7 years agoMerge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
Sundeep Ghuman [Wed, 7 Jun 2017 23:25:57 +0000 (23:25 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
am: 584406f8e1

Change-Id: I42fad81d99eb8ed540ef24fae1b4e86402b33a82

7 years agoMerge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
Bryce Lee [Wed, 7 Jun 2017 23:23:17 +0000 (23:23 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev

7 years agoMerge "Remove Wifi Badges from platform." into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 23:19:04 +0000 (23:19 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev

7 years agoMerge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 23:18:07 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev

7 years agoRevert "Coordinate configuration changes and window frame size."
Bryce Lee [Wed, 7 Jun 2017 23:01:56 +0000 (23:01 +0000)]
Revert "Coordinate configuration changes and window frame size."

This reverts commit afb45bba8379df530182dae882ec70329423dcfe.

Bug: 32839232
Fixes: 62424393
Change-Id: Ifaa0176e18100ec85b8c81268a26fb16ffe9b5f3

7 years agoPassing callingUid to internal methods
Todd Kennedy [Tue, 6 Jun 2017 16:15:46 +0000 (09:15 -0700)]
Passing callingUid to internal methods

Sometimes callers want to clear the calling identity [to avoid permission
calls]. In this case, allow passing the original calling identity to
internal methods.

Test: Manual; create profile account and observe launcher still works cross profile
Test: bit FrameworksServicesTests:com.android.server.pm.ShortcutManagerTest{1..10}
Change-Id: I73f8ad4b2dc1895227c3fcb14f3f1f18f600562f
Fixes: 38349978

7 years agoFixed an issue where the icons had the wrong color
Selim Cinek [Wed, 7 Jun 2017 22:51:29 +0000 (15:51 -0700)]
Fixed an issue where the icons had the wrong color

The color of the icons was taken from the ambient view
and wasn't updated when dark changed.

Change-Id: I472e76ff9d4d92500faae5517f10bdeb2658936d
Fixes: 62423352
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java

7 years agoMerge "Update strings for modem restricted state." into oc-dev
Sanket Padawe [Wed, 7 Jun 2017 21:53:44 +0000 (21:53 +0000)]
Merge "Update strings for modem restricted state." into oc-dev
am: 58977d1035

Change-Id: Id08df9dfdc858dfc4dfb31e7c6ad85fbe2b1869a

7 years agoMerge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
Jorim Jaggi [Wed, 7 Jun 2017 21:46:41 +0000 (21:46 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
am: fc1753d495

Change-Id: I2024b1b5e967fc64a4b068fd47643f94478dcf5c

7 years agoMerge "Update strings for modem restricted state." into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 21:42:33 +0000 (21:42 +0000)]
Merge "Update strings for modem restricted state." into oc-dev

7 years agoMerge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 21:40:00 +0000 (21:40 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev

7 years agoEmbms download setup
Hall Liu [Fri, 19 May 2017 22:28:09 +0000 (15:28 -0700)]
Embms download setup

Add MbmsDownloadReceiver and MbmsTempFileProvider to facilitate MBMS
download.
Fill in the download method in MbmsDownloadManager

Test: testapps
Change-Id: Ibb30f3b2b9d14b9df6b53c06916c21e3ca3a42c6

7 years agoMerge "Fixed a flicker of group notifications" into oc-dev
Selim Cinek [Wed, 7 Jun 2017 20:58:11 +0000 (20:58 +0000)]
Merge "Fixed a flicker of group notifications" into oc-dev
am: beba1bf936

Change-Id: Ia5a12355fd1ed7ec8c9e4cea68e5b17764479ebd

7 years agoMerge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
Winson Chung [Wed, 7 Jun 2017 20:53:42 +0000 (20:53 +0000)]
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
am: fd6b3c6da3

Change-Id: I262857f51aff127c3e1c4a223e22e7129060a9e7

7 years agoMerge "Fixed a flicker of group notifications" into oc-dev
Selim Cinek [Wed, 7 Jun 2017 20:47:47 +0000 (20:47 +0000)]
Merge "Fixed a flicker of group notifications" into oc-dev

7 years agoMerge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 20:46:15 +0000 (20:46 +0000)]
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev

7 years agoMerge "Notify registered packages of visible accounts change when authenticators...
Jian Sun [Wed, 7 Jun 2017 20:37:51 +0000 (20:37 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev
am: 8d5b58a660

Change-Id: I21f8e344b794a5e24f92a0895843b7875b764eba

7 years agoAdd timeout to StrictMode flash.
Jeff Sharkey [Wed, 7 Jun 2017 20:34:38 +0000 (14:34 -0600)]
Add timeout to StrictMode flash.

Consider an app that requests that a StrictMode border be shown, and
then immediately crashes.  We'd end up showing the bars indefinitely,
which is a terrible UX.

This CL enqueues a second message to tear down the bars if nobody
asks for them to be taken down within 1 second.

Test: manual app that crashed after showing violation bars
Bug: 37787765
Change-Id: I45d2078d0dcaa94e8f24087d028f5f06d12c4349

7 years agoKeyguard: Increase clock size
Adrian Roos [Wed, 7 Jun 2017 19:18:05 +0000 (12:18 -0700)]
Keyguard: Increase clock size

Test: observe that keyguard clock looks slightly bigger now
Change-Id: Ic55582abb1cf82bf104afce7d1271e456c78aa1b
Fixes: 62105028

7 years agoMerge "Notify registered packages of visible accounts change when authenticators...
Jian Sun [Wed, 7 Jun 2017 20:31:00 +0000 (20:31 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev

7 years agoMerge "Revert "Change default for group alert behavior"" into oc-dev
Julia Reynolds [Wed, 7 Jun 2017 20:21:38 +0000 (20:21 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev
am: 6e96251d92

Change-Id: I167f941e2f09f240dd6109f849ccd87dee57f47c

7 years agoMerge "Revert "Change default for group alert behavior"" into oc-dev
Julia Reynolds [Wed, 7 Jun 2017 20:12:21 +0000 (20:12 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev

7 years agoFramework: Remove SamplingProfiler
Andreas Gampe [Fri, 2 Jun 2017 00:17:23 +0000 (17:17 -0700)]
Framework: Remove SamplingProfiler

Remove the very old and unsupported SamplingProfilerIntegration. This
CL removes the code parts.

(cherry picked from commit d52cad2cc9af5eb54b28b69fa5b8242258e590ae)

Bug: 37272346
Test: m
Test: Device boots
Change-Id: I64d77244b5816ef1f605d19530b96be38f5c1bc6

7 years agoDO NOT MERGE: Kill Wifi Badging in OC.
Sundeep Ghuman [Tue, 6 Jun 2017 19:27:25 +0000 (12:27 -0700)]
DO NOT MERGE: Kill Wifi Badging in OC.

Speed labeling is turned on in O-DR hence this CL should not be merged
into master. Using the merged in tag below which implements speed
labeling (ag/2346102) to prevent this CL from being merged into upstream
branches which need scoring ui.

Merged-In: I0fd96da6a06dafd8c8ebb435a2725ab155bd26ed

Bug: b/35628911
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java

Change-Id: I5740f68be25d5ec297f1f7dc3b3e59203cec2eb5

7 years agoAlso inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND
Jorim Jaggi [Wed, 7 Jun 2017 19:38:19 +0000 (12:38 -0700)]
Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND

To make sure we won't cause SystemUI to draw the black status bar
background while the starting window is visible.

Test: Warm open chrome
Test: go/wm-smoke
Bug: 38136531
Change-Id: I8dfc0926cafef9d41e78a637523316ac46ce05df

7 years agoMerge "Better error message for AVD" into oc-dev
Doris Liu [Wed, 7 Jun 2017 19:37:26 +0000 (19:37 +0000)]
Merge "Better error message for AVD" into oc-dev
am: cabf9cdc2e

Change-Id: I96b7ac9525e4096da2662f1c1973e2ee52008cfc

7 years agoMerge "Better error message for AVD" into oc-dev
Doris Liu [Wed, 7 Jun 2017 19:31:09 +0000 (19:31 +0000)]
Merge "Better error message for AVD" into oc-dev

7 years agoMerge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
Jeff Sharkey [Wed, 7 Jun 2017 19:12:59 +0000 (19:12 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
am: 6746aa8c4d

Change-Id: I6b78fba341499617e279b38f2e1885cd58551b0d

7 years agoMerge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
Jeff Sharkey [Wed, 7 Jun 2017 19:03:54 +0000 (19:03 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev

7 years agoMerge "always adjust per-user application info" into oc-dev
Todd Kennedy [Wed, 7 Jun 2017 18:52:27 +0000 (18:52 +0000)]
Merge "always adjust per-user application info" into oc-dev
am: 91a9d65e42

Change-Id: I1c7af6ce2ef12fd445389325e98b84b552efae88

7 years agoMerge "always adjust per-user application info" into oc-dev
Todd Kennedy [Wed, 7 Jun 2017 18:40:53 +0000 (18:40 +0000)]
Merge "always adjust per-user application info" into oc-dev

7 years agoMerge "Fix IndexOutOfRange in dumpsys content." into oc-dev
Makoto Onuki [Wed, 7 Jun 2017 18:40:44 +0000 (18:40 +0000)]
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
am: 28afa23a8f

Change-Id: I4c3561c8496a3892ca7a0ea425b979298b20acde

7 years agoMerge "Fix IndexOutOfRange in dumpsys content." into oc-dev
Makoto Onuki [Wed, 7 Jun 2017 18:33:19 +0000 (18:33 +0000)]
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev

7 years agoMerge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
Selim Cinek [Wed, 7 Jun 2017 18:22:09 +0000 (18:22 +0000)]
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
am: 295dd7193e

Change-Id: I8b80da001d23932c48e9721ee1f23850cf4dcb31

7 years agoMerge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
Selim Cinek [Wed, 7 Jun 2017 18:13:25 +0000 (18:13 +0000)]
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev

7 years agoMerge "Make DND tile primary toggle remember favorite zen" into oc-dev
Jason Monk [Wed, 7 Jun 2017 17:28:23 +0000 (17:28 +0000)]
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev
am: 463985178c

Change-Id: Iefa8e2707df45004a5ac37094ee93f1fac4721e9

7 years agoMerge "Make DND tile primary toggle remember favorite zen" into oc-dev
Jason Monk [Wed, 7 Jun 2017 17:17:43 +0000 (17:17 +0000)]
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev

7 years agoUpdate strings for modem restricted state.
Sanket Padawe [Tue, 6 Jun 2017 22:12:04 +0000 (15:12 -0700)]
Update strings for modem restricted state.

Test: manual
Bug: 37377132
Change-Id: Iace44143623034c0255d7cceff839a4712972ee2

7 years agoMerge "Clear native shader when Paint shader changes" into oc-dev
John Reck [Wed, 7 Jun 2017 16:49:08 +0000 (16:49 +0000)]
Merge "Clear native shader when Paint shader changes" into oc-dev
am: d3e78478aa

Change-Id: I8d9c87e232ee1bbc77f3c5618f5856e891c78a74

7 years agoMerge "Clear native shader when Paint shader changes" into oc-dev
John Reck [Wed, 7 Jun 2017 16:42:43 +0000 (16:42 +0000)]
Merge "Clear native shader when Paint shader changes" into oc-dev

7 years agoMerge "Use correct timebase in fg service notifications." into oc-dev
Daniel Sandler [Wed, 7 Jun 2017 15:02:00 +0000 (15:02 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev
am: 630e7841e5

Change-Id: I3493f13c16b24d343f61e80d70f37cf62d6b8ee2

7 years agoMerge "Use correct timebase in fg service notifications." into oc-dev
Daniel Sandler [Wed, 7 Jun 2017 14:56:41 +0000 (14:56 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev

7 years agoRevert "Change default for group alert behavior"
Julia Reynolds [Wed, 7 Jun 2017 14:12:09 +0000 (14:12 +0000)]
Revert "Change default for group alert behavior"

This reverts commit 8f7828ebe7fc6d87e0de112cfda2823fd5818cb2.

Mutes sound on legacy apps that use their summaries to make sound

Change-Id: I635b1428ee247c0b7753f58343637e64da1c981d

Fixes: 62387153

7 years agoMerge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
Wale Ogunwale [Wed, 7 Jun 2017 13:50:25 +0000 (13:50 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
am: 7925f817d0

Change-Id: If142910eebf83a19e863004592335b38b94e1763

7 years agoMerge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
Wale Ogunwale [Wed, 7 Jun 2017 13:45:02 +0000 (13:45 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev

7 years agoMake DND tile primary toggle remember favorite zen
Jason Monk [Wed, 7 Jun 2017 13:15:54 +0000 (09:15 -0400)]
Make DND tile primary toggle remember favorite zen

Test: manual
Change-Id: I2b589dbabf4bd7704d4df968ecbd986604e3b757
Fixes: 37794901

7 years agoMerge "Add additional mocking for Context innards" am: a65aa77c1c am: 35182218d3
Erik Kline [Wed, 7 Jun 2017 09:51:52 +0000 (09:51 +0000)]
Merge "Add additional mocking for Context innards" am: a65aa77c1c am: 35182218d3
am: f22995eed5

Change-Id: Ibde5e3e048236d32ea3c1ba2c2700bb6a75323e6

7 years agoMerge "Add additional mocking for Context innards" am: a65aa77c1c
Erik Kline [Wed, 7 Jun 2017 09:46:11 +0000 (09:46 +0000)]
Merge "Add additional mocking for Context innards" am: a65aa77c1c
am: 35182218d3

Change-Id: I7f08086badfddcf9d667a749cf035e36366f9a7c

7 years agoMerge "Add additional mocking for Context innards"
Erik Kline [Wed, 7 Jun 2017 09:40:37 +0000 (09:40 +0000)]
Merge "Add additional mocking for Context innards"
am: a65aa77c1c

Change-Id: I7f780c05c46b00457b194bfb13df5814735f0809

7 years agoMerge "Add additional mocking for Context innards"
Treehugger Robot [Wed, 7 Jun 2017 09:32:02 +0000 (09:32 +0000)]
Merge "Add additional mocking for Context innards"

7 years agoMerge "Captive portal login shows specific network name" am: 01fb05cf62 am: 93fe99aca4
Hugo Benichi [Wed, 7 Jun 2017 08:51:43 +0000 (08:51 +0000)]
Merge "Captive portal login shows specific network name" am: 01fb05cf62 am: 93fe99aca4
am: 75faf02f04

Change-Id: I1561ccd2676315f3110f20fcbfbd55453f92cbed

7 years agoAdd additional mocking for Context innards
Erik Kline [Wed, 7 Jun 2017 07:33:19 +0000 (16:33 +0900)]
Add additional mocking for Context innards

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - cherry-picked to master and verified there as well
Bug: 32163131
Bug: 32561414

Change-Id: I0b5b1b12d55547d08c332c7d274f19f0023a7b07

7 years agoMerge "Captive portal login shows specific network name" am: 01fb05cf62
Hugo Benichi [Wed, 7 Jun 2017 08:43:08 +0000 (08:43 +0000)]
Merge "Captive portal login shows specific network name" am: 01fb05cf62
am: 93fe99aca4

Change-Id: Ie4a418296de498b7d4b4eca75f2d0b3192ed4c64

7 years agoMerge "Captive portal login shows specific network name"
Hugo Benichi [Wed, 7 Jun 2017 08:35:51 +0000 (08:35 +0000)]
Merge "Captive portal login shows specific network name"
am: 01fb05cf62

Change-Id: I205b37d204250d7fc188b2d7d23593d22d03b89d

7 years agoMerge "Captive portal login shows specific network name"
Hugo Benichi [Wed, 7 Jun 2017 08:11:20 +0000 (08:11 +0000)]
Merge "Captive portal login shows specific network name"

7 years agoMerge "Change Android default icon b/35314247 Test: manual" into oc-dev
Hyunyoung Song [Wed, 7 Jun 2017 07:58:58 +0000 (07:58 +0000)]
Merge "Change Android default icon b/35314247 Test: manual" into oc-dev
am: bb4aeb19be

Change-Id: Ie9996ca6a1197dbaf877229c932eba758e15eb5d

7 years agoMerge "Change Android default icon b/35314247 Test: manual" into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 07:50:14 +0000 (07:50 +0000)]
Merge "Change Android default icon b/35314247 Test: manual" into oc-dev

7 years agoMerge "Actually wait until the display is ready." into oc-dev
Michael Wright [Wed, 7 Jun 2017 07:32:49 +0000 (07:32 +0000)]
Merge "Actually wait until the display is ready." into oc-dev
am: 496267f93b

Change-Id: I41bf93f65c215cc841485c7570c7a7e78a0fdf93

7 years agoMerge "Actually wait until the display is ready." into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 07:22:52 +0000 (07:22 +0000)]
Merge "Actually wait until the display is ready." into oc-dev

7 years agoMerge "Vibrator: Allow priority vibrations in low-power mode for accessibility."...
Tyler Freeman [Wed, 7 Jun 2017 06:38:38 +0000 (06:38 +0000)]
Merge "Vibrator: Allow priority vibrations in low-power mode for accessibility." into oc-dev
am: ac36c42a86

Change-Id: Ib30211346cbce8dbb0853469c17994f23b7c456d

7 years agoMerge "Vibrator: Allow priority vibrations in low-power mode for accessibility."...
TreeHugger Robot [Wed, 7 Jun 2017 06:33:03 +0000 (06:33 +0000)]
Merge "Vibrator: Allow priority vibrations in low-power mode for accessibility." into oc-dev

7 years agoMerge "Fix crash in test" into oc-dev
Jorim Jaggi [Wed, 7 Jun 2017 04:20:40 +0000 (04:20 +0000)]
Merge "Fix crash in test" into oc-dev
am: d5ece513ec

Change-Id: I923f532600fe7b3fe372fd4cf2469c2ea2b03569

7 years agoMerge "Fix crash in test" into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 04:12:44 +0000 (04:12 +0000)]
Merge "Fix crash in test" into oc-dev

7 years agoMerge "Merge "Better handle non-recommended use and warn against it in JavaDoc" into...
Android Build Merger (Role) [Wed, 7 Jun 2017 03:50:33 +0000 (03:50 +0000)]
Merge "Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev am: 8d06d8cbf1" into oc-dev-plus-aosp

7 years agoMerge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev
Doris Liu [Wed, 7 Jun 2017 03:49:44 +0000 (03:49 +0000)]
Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev
am: 8d06d8cbf1

Change-Id: I3e8680067b360ed5792f9a9d1be953561fca7969

7 years agoMerge "Revert "Captive portal login shows specific network name"" am: 7f423d00dd...
Hugo Benichi [Wed, 7 Jun 2017 03:47:17 +0000 (03:47 +0000)]
Merge "Revert "Captive portal login shows specific network name"" am: 7f423d00dd am: 24912bb93d
am: 41415facc8

Change-Id: Ic93c6170813b8c43176d57b534e405500c4639c1

7 years agoMerge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev
Doris Liu [Wed, 7 Jun 2017 03:43:07 +0000 (03:43 +0000)]
Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev

7 years agoMerge "Revert "Captive portal login shows specific network name"" am: 7f423d00dd
Hugo Benichi [Wed, 7 Jun 2017 03:41:13 +0000 (03:41 +0000)]
Merge "Revert "Captive portal login shows specific network name"" am: 7f423d00dd
am: 24912bb93d

Change-Id: Ief5a666699e64cf5d5fc79de1b7964f473898f78

7 years agoCaptive portal login shows specific network name
Hugo Benichi [Thu, 1 Jun 2017 03:58:49 +0000 (12:58 +0900)]
Captive portal login shows specific network name

Bug: 62274222
Bug: 38197949
Bug: 36532213
Test: manually tested by triggering the captive portal login activity
Change-Id: I31439b13a87a78982560828f9ea8a3a57591471b

7 years agoMerge "Revert "Captive portal login shows specific network name""
Hugo Benichi [Wed, 7 Jun 2017 03:32:09 +0000 (03:32 +0000)]
Merge "Revert "Captive portal login shows specific network name""
am: 7f423d00dd

Change-Id: I0d77f19cadbf5905215ae576e66057a259f2348e

7 years agoMerge "Revert "Captive portal login shows specific network name""
Hugo Benichi [Wed, 7 Jun 2017 03:23:16 +0000 (03:23 +0000)]
Merge "Revert "Captive portal login shows specific network name""

7 years agoRevert "Captive portal login shows specific network name"
Hugo Benichi [Wed, 7 Jun 2017 03:22:20 +0000 (03:22 +0000)]
Revert "Captive portal login shows specific network name"

This reverts commit 8032ff32ff9c2b6684bd365059f88a858272b633.

Several branches are broken because of this.

Change-Id: I2d9f8b1cc8f93ed8de7d1e01d49c7cd29417820d

7 years agoMerge "Captive portal login shows specific network name" am: ea7322d17e am: d4cb33b83f
Hugo Benichi [Wed, 7 Jun 2017 02:56:15 +0000 (02:56 +0000)]
Merge "Captive portal login shows specific network name" am: ea7322d17e am: d4cb33b83f
am: 6f2d79464d

Change-Id: I88dc4240bc4a8eb84bc3edd7a9f5a873296075fd

7 years agoMerge "Captive portal login shows specific network name" am: ea7322d17e
Hugo Benichi [Wed, 7 Jun 2017 02:49:05 +0000 (02:49 +0000)]
Merge "Captive portal login shows specific network name" am: ea7322d17e
am: d4cb33b83f

Change-Id: Ie52f17dced7db6dfb6c58f935bf976ff72fa723d

7 years agoMerge "Captive portal login shows specific network name"
Hugo Benichi [Wed, 7 Jun 2017 02:42:36 +0000 (02:42 +0000)]
Merge "Captive portal login shows specific network name"
am: ea7322d17e

Change-Id: I48abfa9523854ea3f30883e92d6d3011d41c6a66

7 years agoMerge "Captive portal login shows specific network name"
Hugo Benichi [Wed, 7 Jun 2017 02:33:02 +0000 (02:33 +0000)]
Merge "Captive portal login shows specific network name"

7 years agoBetter handle non-recommended use and warn against it in JavaDoc
Doris Liu [Tue, 6 Jun 2017 21:56:02 +0000 (14:56 -0700)]
Better handle non-recommended use and warn against it in JavaDoc

BUG: 62386748
Test: Follow repro steps in b/62358678. The issue is no
longer reproducible

Change-Id: Ic3cec7c4947296224edb5365d81988d4da7ee5e1

7 years agoVibrator: Allow priority vibrations in low-power mode for accessibility.
Tyler Freeman [Fri, 5 May 2017 00:23:35 +0000 (17:23 -0700)]
Vibrator: Allow priority vibrations in low-power mode for accessibility.

This is mainly for Wear devices that don't have speakers.

Bug: 37543478

Test: Manual:
1. Activate low power mode `adb shell dumpsys battery unplug && adb shell settings put global low_power 1`
2. Then see if Alarm/Timer will vibrate.
3. Send a Hangout Test notification, make sure it does NOT vibrate.

On phones there should be no change. Alarms will not vibrate.

Change-Id: Ia6dffa7e528886e7c84390dbb33b44f298c7afa4

7 years agoMerge "Don't report focusableViewAvailable on add" into oc-dev
Evan Rosky [Wed, 7 Jun 2017 01:09:17 +0000 (01:09 +0000)]
Merge "Don't report focusableViewAvailable on add" into oc-dev
am: 8d4b72c68a

Change-Id: I4169c2ecf3890946090e4c171a666292262118f6

7 years agoFixed a flicker of group notifications
Selim Cinek [Wed, 7 Jun 2017 01:07:47 +0000 (18:07 -0700)]
Fixed a flicker of group notifications

When replacing a supressed group with it's summary, the icon
would flicker. We're now suppressing icon animations of
replaced notifications.

Test: add notification and children 1 by 1 and observe no flickering
Change-Id: I79440e473296e766ab80832ce74f450aee1af8ea
Fixes: 38459207

7 years agoMerge "Don't report focusableViewAvailable on add" into oc-dev
Evan Rosky [Wed, 7 Jun 2017 01:02:13 +0000 (01:02 +0000)]
Merge "Don't report focusableViewAvailable on add" into oc-dev

7 years agoMerge "Fixed autofill filter comparison." into oc-dev
Felipe Leme [Wed, 7 Jun 2017 00:55:27 +0000 (00:55 +0000)]
Merge "Fixed autofill filter comparison." into oc-dev
am: 72f2d98c5a

Change-Id: I1fef87940fe08d875d3d449a830bd652871e2505

7 years agoMerge "Improved debug to diagnose Save issues." into oc-dev
Felipe Leme [Wed, 7 Jun 2017 00:51:31 +0000 (00:51 +0000)]
Merge "Improved debug to diagnose Save issues." into oc-dev
am: be4420cf13

Change-Id: Id65b8d62403af8883503d5b31903d73751f33bf2

7 years agoMerge "Use initial value on save when value didn't change." into oc-dev
Felipe Leme [Wed, 7 Jun 2017 00:46:53 +0000 (00:46 +0000)]
Merge "Use initial value on save when value didn't change." into oc-dev
am: 2e723982d5

Change-Id: Ie8196727744de7b8a5d51fe671bca8c984ae321d