OSDN Git Service
Michael Wright [Wed, 7 Jun 2017 08:37:47 +0000 (08:37 +0000)]
Merge "Actually wait until the display is ready." into oc-dev am:
496267f93b
am:
d581113dc1
Change-Id: I6a9d56e5c6678a1e1d75e9cf74c27362e288a7b3
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:48:58 +0000 (06:48 +0000)]
Merge "Vibrator: Allow priority vibrations in low-power mode for accessibility." into oc-dev am:
ac36c42a86
am:
8cb653925b
Change-Id: I7abd446e96368b50eeff92ea134aeea6999f7c7a
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
Roozbeh Pournader [Wed, 7 Jun 2017 06:21:40 +0000 (06:21 +0000)]
Merge "Move tests with private APIs to coretests"
Qingxi Li [Wed, 7 Jun 2017 04:50:21 +0000 (04:50 +0000)]
Merge "Only show the "Disable eSIM" when eSIM profile is enabled"
Jorim Jaggi [Wed, 7 Jun 2017 04:27:53 +0000 (04:27 +0000)]
Merge "Fix crash in test" into oc-dev am:
d5ece513ec
am:
3a981207ce
Change-Id: I0f564ed2cee6ad4e45968704a4c64029644bbc4c
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
Doris Liu [Wed, 7 Jun 2017 03:58:45 +0000 (03:58 +0000)]
Merge "Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev am:
8d06d8cbf1" into oc-dev-plus-aosp
am:
721ecfd21a
Change-Id: Iec199dd0cfe7beace7549d3e16e888458fd0306c
Hugo Benichi [Wed, 7 Jun 2017 03:54:12 +0000 (03:54 +0000)]
Merge "Revert "Captive portal login shows specific network name"" am:
7f423d00dd am:
24912bb93d am:
41415facc8
am:
335a1d36ea
Change-Id: Ib6285780806a9bbffc9bb302085e78f72c27b1be
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 [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 03:03:12 +0000 (03:03 +0000)]
Merge "Captive portal login shows specific network name" am:
ea7322d17e am:
d4cb33b83f am:
6f2d79464d
am:
8d60db5241
Change-Id: I9484e2d577ca547bbff4b516fcb445b4e8cdcdef
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
TreeHugger Robot [Wed, 7 Jun 2017 02:36:12 +0000 (02:36 +0000)]
Merge "Remove unnecessary code"
Hugo Benichi [Wed, 7 Jun 2017 02:33:02 +0000 (02:33 +0000)]
Merge "Captive portal login shows specific network name"
Andrew Sapperstein [Wed, 7 Jun 2017 02:21:53 +0000 (02:21 +0000)]
Merge "Add config_headlineFontFamily."
TreeHugger Robot [Wed, 7 Jun 2017 02:20:59 +0000 (02:20 +0000)]
Merge "Add strings for improving Wifi wrong password UX"
Andrew Sapperstein [Tue, 6 Jun 2017 01:30:06 +0000 (18:30 -0700)]
Add config_headlineFontFamily.
Creates a config string called config_headlineFontFamily that allows
vendors to override the default font family if they so desire.
Bug:
36855735
Test: ag/
2360364
Change-Id: I145e33650d0feec2a52132ac46322c51a23d8ccd
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
TreeHugger Robot [Wed, 7 Jun 2017 01:23:31 +0000 (01:23 +0000)]
Merge "Fix "OK" speed label string."
Evan Rosky [Wed, 7 Jun 2017 01:19:12 +0000 (01:19 +0000)]
Merge "Don't report focusableViewAvailable on add" into oc-dev am:
8d4b72c68a
am:
2b64c87366
Change-Id: I76ffe2869425314f43b0fc2044b8bb8d80619689
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
Android Build Merger (Role) [Wed, 7 Jun 2017 01:07:26 +0000 (01:07 +0000)]
Merge "Merge "Fixed autofill filter comparison." into oc-dev am:
72f2d98c5a am:
4d47d7ad46"
Felipe Leme [Wed, 7 Jun 2017 01:05:39 +0000 (01:05 +0000)]
Merge "Fixed autofill filter comparison." into oc-dev am:
72f2d98c5a
am:
4d47d7ad46
Change-Id: Ic6d4af3752da2672ce172f09022e0dfaf1bd0810
TreeHugger Robot [Wed, 7 Jun 2017 01:05:16 +0000 (01:05 +0000)]
Merge changes from topic 'dungeon-master'
* changes:
Hide redundant foreground service notifications.
Updates to Dianne's Dungeon.
Felipe Leme [Wed, 7 Jun 2017 01:02:34 +0000 (01:02 +0000)]
Merge "Improved debug to diagnose Save issues." into oc-dev am:
be4420cf13
am:
34e7f3b6ba
Change-Id: I86366b96742aafd1c9f6f9f7a1dc278f0275e3ff
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:57:16 +0000 (00:57 +0000)]
Merge "Use initial value on save when value didn't change." into oc-dev am:
2e723982d5
am:
08365011a2
Change-Id: I38b2e8096b7fe43a294afe400af093b49616335d
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:48:54 +0000 (00:48 +0000)]
Merge "Don't show AUTOFILL menu when text is selected." into oc-dev am:
49231f183f
am:
fc4604f719
Change-Id: I73c6181f7fdd4b2b4c38338c13d9bf439199617f
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
TreeHugger Robot [Wed, 7 Jun 2017 00:45:01 +0000 (00:45 +0000)]
Merge "Replace mockito with a mock class in DynamicLayoutTest"
Marco Nelissen [Wed, 7 Jun 2017 00:39:56 +0000 (00:39 +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
am:
3f4a368a7c
Change-Id: I9675446964d2bd5672fe87674571dae517f5ba3d
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
Marco Nelissen [Wed, 7 Jun 2017 00:31:33 +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:
2c1d4f8f7b
am:
031a20a6c7
Change-Id: I5039c6fc8c0a18fcf14edd30f94975fff6c1fc35
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
Antony Sargent [Wed, 7 Jun 2017 00:17:44 +0000 (17:17 -0700)]
Add strings for improving Wifi wrong password UX
Bug:
33245941
Test: none
Change-Id: If7bc95c70aa6067255d61de5a4a3d71fcfe76886
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
Rob Carr [Wed, 7 Jun 2017 00:03:51 +0000 (00:03 +0000)]
Merge "SurfaceView: Correct inverted alpha detection condition." into oc-dev am:
3946916d56
am:
8296054d4e
Change-Id: Iaf35647355f48300199d888eb884a23750c0059b
Sundeep Ghuman [Tue, 6 Jun 2017 23:56:44 +0000 (16:56 -0700)]
Fix "OK" speed label string.
Bug: b/
35628911
Test: NA
Change-Id: I5fe343338c683b72ad8c12d586dd7ef3dd639d0a
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
Felipe Leme [Tue, 6 Jun 2017 23:53:16 +0000 (23:53 +0000)]
Merge "Catch WindowManager exceptions so they don't crash the system." into oc-dev am:
301fc823f3
am:
9a1b6b0eb2
Change-Id: Ifbda0a75a79e644763e83baf86a7823310a56f5b
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
Android Build Merger (Role) [Tue, 6 Jun 2017 23:49:09 +0000 (23:49 +0000)]
Merge "Merge "Handle renamed packages during default grants" into oc-dev am:
bfc083c3a0 am:
7e05bb7793"
Todd Kennedy [Tue, 6 Jun 2017 23:48:19 +0000 (23:48 +0000)]
Merge "Handle renamed packages during default grants" into oc-dev am:
bfc083c3a0
am:
7e05bb7793
Change-Id: Ib4e3b2799c2a104fd203b6e64e86d6181567b177
Christine Franks [Tue, 6 Jun 2017 23:47:37 +0000 (23:47 +0000)]
Merge "Add TRON counter for demo user creation"
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
Isai Damier [Tue, 6 Jun 2017 23:43:44 +0000 (23:43 +0000)]
Merge "Redundant/duplicate method to close Streams Fixes:
62304559 Test: the code compiles which mean polymorphism works. No additional tests necessary Change-Id: I3d366f12c1f176213979da6b050957bc2adb2938"
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
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
Daniel Sheng [Tue, 6 Jun 2017 23:26:05 +0000 (23:26 +0000)]
Merge "Changed camera lift trigger to default-on."
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
qingxi [Wed, 24 May 2017 22:33:13 +0000 (15:33 -0700)]
Only show the "Disable eSIM" when eSIM profile is enabled
Before this CL, we always show "Disable eSIM" button in SIM lock screen
if the device has eSIM chip. This may make the user who has never used
eSIM or currently is not activated the eSIM Profile confused. This CL
makes the "Disable eSIM" button only be shown iff the device has eSIM
chip and the current activated Profile is eSIM profile.
Bug:
37518023
Test: E2E
Change-Id: Id5a1325f49733528a370ec7145fe49731243bcf7
Selim Cinek [Tue, 6 Jun 2017 23:11:15 +0000 (23:11 +0000)]
Merge "Fixed an issue where would could be left with empty notifications" into oc-dev am:
25e509462f
am:
b8c7c9ee2d
Change-Id: I8560e900e1c0c2cf7caf1ba748a5b928ff69f638
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
TreeHugger Robot [Tue, 6 Jun 2017 23:03:56 +0000 (23:03 +0000)]
Merge "Add logging to track search no-result case"
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
Daniel Sandler [Tue, 6 Jun 2017 23:00:53 +0000 (23:00 +0000)]
Merge "resolve merge conflicts of
be23ef368f1a to oc-dev-plus-aosp" into oc-dev-plus-aosp
am:
9dd289529d
Change-Id: Ic2151c9a6a4f8ff1d76effa5b935ffa3e43bb0d8
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
Roozbeh Pournader [Tue, 6 Jun 2017 22:44:03 +0000 (15:44 -0700)]
Replace mockito with a mock class in DynamicLayoutTest
Previously, a mocked object was used incorrectly in the test. It was
attached twice as a span, which would result in the second identical
span causing the first span to get removed.
Now we use two different instances of a mock class, to make sure we
are attaching different spans.
Fixes:
62217995
Test: adb shell am instrument -w -e package android.text com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ib9f7a467410d28280d77a1023e0fc328c652e2af
Keyvan Amiri [Tue, 6 Jun 2017 22:13:48 +0000 (22:13 +0000)]
Merge "Disabled task snapshot for TV" into oc-dev am:
08b953dd2e
am:
6cae189d26
Change-Id: I4c71d58c3f9d640abaa941324c570c6168002cad
sunjian [Tue, 6 Jun 2017 22:11:19 +0000 (22:11 +0000)]
Update AccountManagerService side logic for .getAccountsByTypeForPackage with null type. am:
d62dc39dc5
am:
b22429d53f
Change-Id: I40675817d0102c51a4ad4988bc4c1445842883b3
Keyvan Amiri [Tue, 6 Jun 2017 22:05:13 +0000 (22:05 +0000)]
Merge "Disabled task snapshot for TV" into oc-dev
am:
08b953dd2e
Change-Id: I220460741e82abbfaf3746763cbb4b09e9357965
TreeHugger Robot [Tue, 6 Jun 2017 21:56:16 +0000 (21:56 +0000)]
Merge "Disabled task snapshot for TV" into oc-dev
sunjian [Tue, 6 Jun 2017 21:56:07 +0000 (21:56 +0000)]
Update AccountManagerService side logic for .getAccountsByTypeForPackage with null type.
am:
d62dc39dc5
Change-Id: Idf3475786676e9713e4fa5756ecce9c675da8c3e
Julius D'souza [Tue, 6 Jun 2017 21:48:26 +0000 (21:48 +0000)]
Merge "Add state machine model for skipping initial brightness ramps." into oc-dev am:
9fd3076fe6
am:
cc162a1e4f
Change-Id: If743c9ed506aa6e1035303d50c48de7093a8c7e7
sunjian [Thu, 1 Jun 2017 19:05:59 +0000 (12:05 -0700)]
Update AccountManagerService side logic for .getAccountsByTypeForPackage
with null type.
Bug:
37987384
Test: manual, APCT
Change-Id: I4d5f735736f1b1d7bbf778aee2ec813071c34f19
OSDN Git Service
