OSDN Git Service
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
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
Selim Cinek [Wed, 7 Jun 2017 20:47:47 +0000 (20:47 +0000)]
Merge "Fixed a flicker of group notifications" 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
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
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
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
Julia Reynolds [Wed, 7 Jun 2017 20:12:21 +0000 (20:12 +0000)]
Merge "Revert "Change default for group alert behavior"" 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
Doris Liu [Wed, 7 Jun 2017 19:31:09 +0000 (19:31 +0000)]
Merge "Better error message for AVD" 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
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
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
Todd Kennedy [Wed, 7 Jun 2017 18:40:53 +0000 (18:40 +0000)]
Merge "always adjust per-user application info" 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
Makoto Onuki [Wed, 7 Jun 2017 18:33:19 +0000 (18:33 +0000)]
Merge "Fix IndexOutOfRange in dumpsys content." 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
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
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
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
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
John Reck [Wed, 7 Jun 2017 16:42:43 +0000 (16:42 +0000)]
Merge "Clear native shader when Paint shader changes" 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
Daniel Sandler [Wed, 7 Jun 2017 14:56:41 +0000 (14:56 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev
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
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
Wale Ogunwale [Wed, 7 Jun 2017 13:45:02 +0000 (13:45 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
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
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
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
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
Treehugger Robot [Wed, 7 Jun 2017 09:32:02 +0000 (09:32 +0000)]
Merge "Add additional mocking for Context innards"
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
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
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
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
Hugo Benichi [Wed, 7 Jun 2017 08:11:20 +0000 (08:11 +0000)]
Merge "Captive portal login shows specific network name"
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
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
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
TreeHugger Robot [Wed, 7 Jun 2017 07:22:52 +0000 (07:22 +0000)]
Merge "Actually wait until the display is ready." into oc-dev
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
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
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
TreeHugger Robot [Wed, 7 Jun 2017 04:12:44 +0000 (04:12 +0000)]
Merge "Fix crash in test" into oc-dev
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
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
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
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
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
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
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
Hugo Benichi [Wed, 7 Jun 2017 03:23:16 +0000 (03:23 +0000)]
Merge "Revert "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
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
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
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
Hugo Benichi [Wed, 7 Jun 2017 02:33:02 +0000 (02:33 +0000)]
Merge "Captive portal login shows specific network name"
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
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
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
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
Evan Rosky [Wed, 7 Jun 2017 01:02:13 +0000 (01:02 +0000)]
Merge "Don't report focusableViewAvailable on add" 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
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
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
Felipe Leme [Wed, 7 Jun 2017 00:38:40 +0000 (00:38 +0000)]
Merge "Don't show AUTOFILL menu when text is selected." into oc-dev
am:
49231f183f
Change-Id: I5d182201cc568caa894dddd6352cbf6abb83a03b
Marco Nelissen [Wed, 7 Jun 2017 00:31:38 +0000 (00:31 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887 am:
4d9e6150f3 am:
d7fe3ea6a8 am:
db9d2588b8 am:
9e4e6c4b7c
am:
6596f721fd
Change-Id: Iaf21b4182d659b4ffc5b2e514c7a4dfcb15cc143
Felipe Leme [Wed, 7 Jun 2017 00:30:48 +0000 (00:30 +0000)]
Merge "Fixed autofill filter comparison." into oc-dev
Felipe Leme [Wed, 7 Jun 2017 00:26:05 +0000 (00:26 +0000)]
Merge "Improved debug to diagnose Save issues." into oc-dev
Felipe Leme [Wed, 7 Jun 2017 00:25:01 +0000 (00:25 +0000)]
Merge "Use initial value on save when value didn't change." into oc-dev
Marco Nelissen [Wed, 7 Jun 2017 00:24:23 +0000 (00:24 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887 am:
4d9e6150f3 am:
d7fe3ea6a8 am:
db9d2588b8 am:
9e4e6c4b7c
am:
2c1d4f8f7b
Change-Id: I90250994c72bd9cc54ebb87df3f0f7f510417ef1
Felipe Leme [Wed, 7 Jun 2017 00:23:59 +0000 (00:23 +0000)]
Merge "Don't show AUTOFILL menu when text is selected." into oc-dev
Marco Nelissen [Wed, 7 Jun 2017 00:20:21 +0000 (00:20 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887 am:
4d9e6150f3 am:
d7fe3ea6a8 am:
db9d2588b8
am:
9e4e6c4b7c
Change-Id: I96b9977d0bd218e3c13dcd177b8033657a023d14
Marco Nelissen [Wed, 7 Jun 2017 00:16:34 +0000 (00:16 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887 am:
4d9e6150f3 am:
d7fe3ea6a8 am:
db9d2588b8
am:
9e4e6c4b7c
Change-Id: I1d028759fecc34081daf0be653a1b729e0e048ac
Marco Nelissen [Wed, 7 Jun 2017 00:10:27 +0000 (00:10 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887 am:
4d9e6150f3 am:
d7fe3ea6a8
am:
db9d2588b8
Change-Id: I8da5c1b0f6fb3d7676c463c354167abce71f8124
Jorim Jaggi [Wed, 7 Jun 2017 00:04:19 +0000 (17:04 -0700)]
Fix crash in test
Test: runtest systemui
Change-Id: I841b6ed21fb101e7873b218521c480c904f361f8
Fixes:
62389344
Marco Nelissen [Wed, 7 Jun 2017 00:04:12 +0000 (00:04 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887 am:
4d9e6150f3
am:
d7fe3ea6a8
Change-Id: Ic5a7104241d36e82418ce5a2a43595d2fa4bff47
Marco Nelissen [Tue, 6 Jun 2017 23:54:55 +0000 (23:54 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887
am:
4d9e6150f3
Change-Id: I5ede1388f265920fa5dd835c4a6335380daa9103
Rob Carr [Tue, 6 Jun 2017 23:52:56 +0000 (23:52 +0000)]
Merge "SurfaceView: Correct inverted alpha detection condition." into oc-dev
am:
3946916d56
Change-Id: Ia2d5ff30183d8588319dc4aa24f5512f3db75e55
sunjian [Mon, 5 Jun 2017 19:16:59 +0000 (12:16 -0700)]
Notify registered packages of visible accounts change when
authenticators get uninstalled.
Bug:
38332496
Test: manual
Change-Id: I877d52d511deb177d07f9e602d84f33fd0fd2c82
Marco Nelissen [Tue, 6 Jun 2017 23:45:51 +0000 (23:45 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3
am:
ce5c72e887
Change-Id: I081f15c5d6bb16b3f490e53dbc2910a45e6a920b
Felipe Leme [Tue, 6 Jun 2017 23:44:42 +0000 (23:44 +0000)]
Merge "Catch WindowManager exceptions so they don't crash the system." into oc-dev
am:
301fc823f3
Change-Id: Ib28ae2a7b3614fa73fa4e1b08e5607f7d6011891
Todd Kennedy [Tue, 6 Jun 2017 23:41:06 +0000 (23:41 +0000)]
Merge "Handle renamed packages during default grants" into oc-dev
am:
bfc083c3a0
Change-Id: I068bb7548d1c972c3824185e5ab933a7b48c387b
Marco Nelissen [Tue, 6 Jun 2017 23:39:57 +0000 (23:39 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113
am:
69b6a382a3
Change-Id: I2c599bac680bda5d4dcfa4f3b9fb5f1413839da0
Marco Nelissen [Tue, 6 Jun 2017 23:33:50 +0000 (23:33 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1
am:
e18e8c4113
Change-Id: I5c34b680b1c7abcfd33c8719406516fe796afebb
Rob Carr [Tue, 6 Jun 2017 23:32:59 +0000 (23:32 +0000)]
Merge "SurfaceView: Correct inverted alpha detection condition." into oc-dev
Makoto Onuki [Tue, 6 Jun 2017 23:32:47 +0000 (16:32 -0700)]
Fix IndexOutOfRange in dumpsys content.
The table has 13 columns but the declaration was only 12.
Bug:
62388237
Test: manual test with "dumpsys content"
Change-Id: I8cbc57dde6ff2dbadb64f4d6061298f73fa73119
Felipe Leme [Tue, 6 Jun 2017 23:30:57 +0000 (23:30 +0000)]
Merge "Catch WindowManager exceptions so they don't crash the system." into oc-dev
Todd Kennedy [Tue, 6 Jun 2017 23:29:05 +0000 (23:29 +0000)]
Merge "Handle renamed packages during default grants" into oc-dev
Marco Nelissen [Tue, 6 Jun 2017 23:28:27 +0000 (23:28 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2
am:
3272cf26c1
Change-Id: I92f069aa6f3a897f9bfba4405dcd64dc066db944
Marco Nelissen [Tue, 6 Jun 2017 23:22:14 +0000 (23:22 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546
am:
6d5bc9a3c2
Change-Id: I8165c2218d0d5de41468f8acff86a720c03d1f52
Marco Nelissen [Tue, 6 Jun 2017 23:16:24 +0000 (23:16 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64
am:
4b78a79546
Change-Id: Iceb4edfd80a0a483d28f2624669eff9dd86bfcb8
Marco Nelissen [Tue, 6 Jun 2017 23:10:16 +0000 (23:10 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb
am:
5181a7ab64
Change-Id: I34a176a0da235836eaa9e44b843ec5d5654b8db9
Selim Cinek [Tue, 6 Jun 2017 23:02:41 +0000 (23:02 +0000)]
Merge "Fixed an issue where would could be left with empty notifications" into oc-dev
am:
25e509462f
Change-Id: I69457f9a26085bc98e24b0c975106ddaa3199e98
Marco Nelissen [Tue, 6 Jun 2017 23:02:35 +0000 (23:02 +0000)]
Merge "Close connection before retrying" into lmp-dev
am:
a8648ecebb
Change-Id: I744fdb979aa2803b53d3ff6f4e3e72f6f1160d74
TreeHugger Robot [Tue, 6 Jun 2017 22:54:36 +0000 (22:54 +0000)]
Merge "Fixed an issue where would could be left with empty notifications" into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 22:53:55 +0000 (22:53 +0000)]
Merge "Close connection before retrying" into lmp-dev
Daniel Sandler [Tue, 6 Jun 2017 22:53:00 +0000 (22:53 +0000)]
Merge "resolve merge conflicts of
be23ef368f1a to oc-dev-plus-aosp" into oc-dev-plus-aosp
Hyunyoung Song [Tue, 2 May 2017 01:43:07 +0000 (18:43 -0700)]
Change Android default icon
b/
35314247
Test: manual
Change-Id: I50964e616565e2e766f903a2a28de7194908bd7b
OSDN Git Service
