OSDN Git Service
Sungsoo Lim [Fri, 4 Aug 2017 00:37:19 +0000 (00:37 +0000)]
Merge "Catch IllegalArgumentException when disconnect" into oc-mr1-dev
am:
1d66ccde36
Change-Id: I2db7c5b73f6b4af128dda75150f7bd2ebeeb653c
Sungsoo Lim [Fri, 4 Aug 2017 00:34:08 +0000 (00:34 +0000)]
Merge "Do not call ItemCallback after disconnected" into oc-mr1-dev
am:
8724fb9348
Change-Id: I76638c3b5b2598019ccb669113d3ecc45a0091ff
Sungsoo Lim [Fri, 4 Aug 2017 00:22:00 +0000 (00:22 +0000)]
Merge "Catch IllegalArgumentException when disconnect" into oc-mr1-dev
Sungsoo Lim [Fri, 4 Aug 2017 00:21:27 +0000 (00:21 +0000)]
Merge "Do not call ItemCallback after disconnected" into oc-mr1-dev
Makoto Onuki [Thu, 3 Aug 2017 23:53:25 +0000 (23:53 +0000)]
Merge "Bit: Don't ignore errors and crashes" into oc-mr1-dev
am:
437e43ed1f
Change-Id: Idc4e96751659c08d0b95760f41ba47c45bc4e476
TreeHugger Robot [Thu, 3 Aug 2017 23:41:40 +0000 (23:41 +0000)]
Merge "Bit: Don't ignore errors and crashes" into oc-mr1-dev
Amith Yamasani [Thu, 3 Aug 2017 23:34:23 +0000 (23:34 +0000)]
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev am:
5a800cf069
am:
6aaaa2bbb0
Change-Id: I350fe683266ba2a139043c16d282a27b558a625e
Amith Yamasani [Thu, 3 Aug 2017 23:29:23 +0000 (23:29 +0000)]
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev am:
5a800cf069
am:
26f8f5c868
Change-Id: I44fe5b45c8cdc3d4ddd7edc210641f3883265c58
Christopher Tate [Thu, 3 Aug 2017 23:18:57 +0000 (23:18 +0000)]
Merge "Use normal API for legacy wallpaper restore" into oc-mr1-dev
am:
4204f1658c
Change-Id: I2621dcbb5b727a5420095223f36d3e6e5784799d
Amith Yamasani [Thu, 3 Aug 2017 23:18:32 +0000 (23:18 +0000)]
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev
am:
5a800cf069
Change-Id: I4b2e2dc81baea8078b0bca1db357e234bda27bf7
Amith Yamasani [Thu, 3 Aug 2017 23:18:29 +0000 (23:18 +0000)]
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev
am:
5a800cf069
Change-Id: I99d131e00dc43982f41e8837f44a66c71312615a
Android Build Merger (Role) [Thu, 3 Aug 2017 23:12:44 +0000 (23:12 +0000)]
Merge "Merge "Multi-user and WallpaperColors" into oc-dr1-dev am:
e09e5ef21b -s ours am:
57d0423e91 -s ours" into oc-mr1-dev-plus-aosp
Lucas Dupin [Thu, 3 Aug 2017 23:11:20 +0000 (23:11 +0000)]
Merge "Multi-user and WallpaperColors" into oc-dr1-dev am:
e09e5ef21b -s ours
am:
57d0423e91 -s ours
Change-Id: Ia35fcfad8e0910909c1806d95d3a8c0c33d954ff
Lucas Dupin [Thu, 3 Aug 2017 23:10:23 +0000 (23:10 +0000)]
Merge "Multi-user and WallpaperColors" into oc-dr1-dev am:
e09e5ef21b
am:
89f58e156e -s ours
Change-Id: I455ae6d0552232647409482479bae5a41189faa9
TreeHugger Robot [Thu, 3 Aug 2017 23:07:53 +0000 (23:07 +0000)]
Merge "Use normal API for legacy wallpaper restore" into oc-mr1-dev
Amith Yamasani [Thu, 3 Aug 2017 23:07:32 +0000 (23:07 +0000)]
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev
Lucas Dupin [Thu, 3 Aug 2017 22:56:54 +0000 (22:56 +0000)]
Merge "Multi-user and WallpaperColors" into oc-dr1-dev
am:
e09e5ef21b
Change-Id: Idb06a8e04ac1cb9bf73fe168217d5369bb412b4f
Lucas Dupin [Thu, 3 Aug 2017 22:56:50 +0000 (22:56 +0000)]
Merge "Multi-user and WallpaperColors" into oc-dr1-dev
am:
e09e5ef21b -s ours
Change-Id: Ib197bc342f3829e683a8cba1b2f1cb1856514b1b
Lucas Dupin [Thu, 3 Aug 2017 22:48:27 +0000 (22:48 +0000)]
Merge "Multi-user and WallpaperColors" into oc-dr1-dev
Jeff Sharkey [Thu, 3 Aug 2017 22:34:39 +0000 (22:34 +0000)]
DO NOT MERGE: Fix searching for overridden methods. am:
008ddd928d -s ours am:
f7602ac731
am:
b89f75efad
Change-Id: Ie405532b69f8c11c1c16d5d56ad0ff96d7369f03
Jeff Sharkey [Thu, 3 Aug 2017 21:17:06 +0000 (21:17 +0000)]
DO NOT MERGE: Fix searching for overridden methods. am:
008ddd928d -s ours
am:
f7602ac731
Change-Id: Ib328db263876028131009f8b02033da5c99e6327
Svet Ganov [Thu, 3 Aug 2017 21:09:06 +0000 (21:09 +0000)]
Merge "Backup all backupable settings" into oc-mr1-dev
am:
5444e9d445
Change-Id: I6c361a8e76596256aa98336c2ec7f6f24df5a782
Jeff Sharkey [Thu, 3 Aug 2017 21:04:47 +0000 (21:04 +0000)]
DO NOT MERGE: Fix searching for overridden methods.
am:
008ddd928d -s ours
Change-Id: Ifb0f9c06ad25a526d8780ce37d0aa2db7934eba7
TreeHugger Robot [Thu, 3 Aug 2017 20:58:35 +0000 (20:58 +0000)]
Merge "Backup all backupable settings" into oc-mr1-dev
Jeremy Joslin [Thu, 3 Aug 2017 20:46:38 +0000 (20:46 +0000)]
Merge "NetworkRecommendationProviders require the location permission." into oc-mr1-dev
am:
589ba65d91
Change-Id: I971c3a922340ee2d73722eea5e293d928b6f9a54
TreeHugger Robot [Thu, 3 Aug 2017 20:37:16 +0000 (20:37 +0000)]
Merge "NetworkRecommendationProviders require the location permission." into oc-mr1-dev
Android Build Merger (Role) [Thu, 3 Aug 2017 19:13:48 +0000 (19:13 +0000)]
Merge "Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL am:
61ad5ae921 am:
39a9832df1" into oc-mr1-dev-plus-aosp
Andre Eisenbach [Thu, 3 Aug 2017 19:11:07 +0000 (19:11 +0000)]
Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL am:
61ad5ae921
am:
39a9832df1
Change-Id: I5b861103fdd7099ca38479481388132580e02fdc
Andre Eisenbach [Thu, 3 Aug 2017 19:11:00 +0000 (19:11 +0000)]
Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL am:
61ad5ae921
am:
c0d1f46845
Change-Id: I8c0ffbccee4a53acc39d8cb164e1f32477294b73
Andre Eisenbach [Thu, 3 Aug 2017 19:00:00 +0000 (19:00 +0000)]
Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL
am:
61ad5ae921
Change-Id: Iadbb0716f82a42366d8aba687208a1df81eafb70
Andre Eisenbach [Thu, 3 Aug 2017 18:59:59 +0000 (18:59 +0000)]
Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL
am:
61ad5ae921
Change-Id: I5726036ecf16992e1a9e56ac568b287547208a14
Andre Eisenbach [Wed, 2 Aug 2017 23:51:10 +0000 (16:51 -0700)]
Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL
ACTION_PAIRING_CANCEL is triggered as a result of an ACL connection
going down, causing a "Couldn't pair" prompt. This can happen on some
car kits, even if the pairing is successful and the car kit briefly
tearing down the ACL connection after pairing and resuming it
immediately afterwards.
If a connection gets disconnected during a normal bonding procedure, the
UNBOND_REASON_REMOTE_DEVICE_DOWN reason code for the
ACTION_BOND_STATE_CHANGED already indicates this issue and will inform
the user.
Bug:
63975046
Test: manual
Change-Id: I663d8b7700741927c72e38e30cd993c0b81511a9
Sergey Vasilinets [Thu, 3 Aug 2017 18:39:15 +0000 (18:39 +0000)]
Merge "Update toast UI" into oc-dr1-dev am:
436b1e2f0e
am:
189ff1b021
Change-Id: Idbc6646e85044304cc87aa4d67b807b8b2e169d2
Sergey Vasilinets [Thu, 3 Aug 2017 18:35:56 +0000 (18:35 +0000)]
Merge "Update toast UI" into oc-dr1-dev am:
436b1e2f0e
am:
ccf0381aae
Change-Id: I02254bd81a254f76014f3f2240fc6ecb1400a0e4
Sergey Vasilinets [Thu, 3 Aug 2017 18:25:19 +0000 (18:25 +0000)]
Merge "Update toast UI" into oc-dr1-dev
am:
436b1e2f0e
Change-Id: Ia346c80194c8792e51be927cc19e4555d3c1527f
Sergey Vasilinets [Thu, 3 Aug 2017 18:24:51 +0000 (18:24 +0000)]
Merge "Update toast UI" into oc-dr1-dev
am:
436b1e2f0e
Change-Id: I5873b48beab466d1a7d99c1173d93bb1e5678a1a
Sergey Vasilinets [Thu, 3 Aug 2017 18:14:24 +0000 (18:14 +0000)]
Merge "Update toast UI" into oc-dr1-dev
Christopher Tate [Tue, 1 Aug 2017 23:32:49 +0000 (16:32 -0700)]
Use normal API for legacy wallpaper restore
No longer do we play crazy rename-into-place tricks! Just take
the restored image and treat it as an ordinary new system wallpaper,
and let the system machinery do all its proper work. While we're at
it, we get rid of the now-spurious shenanigans about backing up the
wallpaper under the 'android' package, an overdue and welcome bit
of thinning.
In addition, we now fully migrate a legacy wallpaper image to have
both a source and a display crop in place. We were previously
not generating the equivalent source image, which made N+ backups
unable to store the image properly.
Fix
64269208
Fix
62809439
Test: manual (set wallpaper under M, backup, flash to ToT,
force restore)
Change-Id: If9b26b777f0fda95cf37c3c790a3fa4e82ff0340
Abodunrinwa Toki [Thu, 3 Aug 2017 18:07:19 +0000 (18:07 +0000)]
Merge "Remove LangId related code." into oc-mr1-dev
am:
38bbbdfae6
Change-Id: I336cab55855dc43c42d73fdf363d8db016bdaf70
TreeHugger Robot [Thu, 3 Aug 2017 17:54:29 +0000 (17:54 +0000)]
Merge "Remove LangId related code." into oc-mr1-dev
Jeff Sharkey [Mon, 19 Jun 2017 22:27:25 +0000 (16:27 -0600)]
DO NOT MERGE: Fix searching for overridden methods.
If the superclass is an abstract class, we want to search it for
possibly overridden methods; we don't want to search ourselves.
This bug resulted in (incorrectly) thinking that overridden "default"
methods from interfaces were standalone methods on the class. (The
expected behavior has always been to omit any overridden methods from
the public API surface area to avoid redundant noise.)
Test: make update-api
Bug:
62675475
Change-Id: Ic92544908692bd9af329d302165e18c7b4738e43
(cherry picked from commit
257529dcae079055d51cb8eb42b249512ae41f36)
Calin Juravle [Thu, 3 Aug 2017 17:24:48 +0000 (17:24 +0000)]
Merge "Save PackageDexUsage on PMS shutdown" into oc-mr1-dev
am:
7b7b99bf56
Change-Id: I78826ba7e64d18d3900a61b550d57feb19f3c8a4
Calin Juravle [Thu, 3 Aug 2017 17:16:57 +0000 (17:16 +0000)]
Merge "Save PackageDexUsage on PMS shutdown" into oc-mr1-dev
Kenny Guy [Thu, 3 Aug 2017 17:05:58 +0000 (17:05 +0000)]
Merge "Update colour to match toasts." into oc-mr1-dev
am:
1da2877b9a
Change-Id: I71c697d116a44845f517aad8b5f05152b917c65c
Tomasz Wasilczyk [Thu, 3 Aug 2017 17:02:52 +0000 (17:02 +0000)]
Merge "Address Broadcast Radio HAL review notes." into oc-mr1-dev
am:
36ea87b075
Change-Id: I8802ac38c0167f0f2705bfaaf174d30743045a07
TreeHugger Robot [Thu, 3 Aug 2017 16:54:41 +0000 (16:54 +0000)]
Merge "Update colour to match toasts." into oc-mr1-dev
Tomasz Wasilczyk [Thu, 3 Aug 2017 16:52:31 +0000 (16:52 +0000)]
Merge "Address Broadcast Radio HAL review notes." into oc-mr1-dev
Lucas Dupin [Thu, 3 Aug 2017 16:35:36 +0000 (16:35 +0000)]
Merge "Multi-user and WallpaperColors" into oc-mr1-dev
am:
22b418448b
Change-Id: I366a0968883a57499392edafcc95c53416268329
Lucas Dupin [Thu, 3 Aug 2017 16:23:41 +0000 (16:23 +0000)]
Merge "Multi-user and WallpaperColors" into oc-mr1-dev
Alexandru-andrei Rotaru [Thu, 3 Aug 2017 15:39:09 +0000 (15:39 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." into stage-aosp-master am:
b9295c7de0 -s ours am:
7b3fd55c30 -s ours
am:
3668323bd7 -s ours
Change-Id: I8204085069cd64e881192c054e60dbc11133f07d
Alexandru-andrei Rotaru [Thu, 3 Aug 2017 15:27:15 +0000 (15:27 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." into stage-aosp-master am:
b9295c7de0 -s ours
am:
7b3fd55c30 -s ours
Change-Id: Ieab87f4b422168e3bcf8250e405ec91ee67d0e27
Alexandru-andrei Rotaru [Thu, 3 Aug 2017 15:19:11 +0000 (15:19 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." into stage-aosp-master
am:
b9295c7de0 -s ours
Change-Id: I86c4d74187f71a91c4532d055e5e28858ee208ca
Android Build Merger (Role) [Thu, 3 Aug 2017 15:17:09 +0000 (15:17 +0000)]
Merge "Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev am:
a957c56da0 am:
49cbe41a2b" into oc-mr1-dev-plus-aosp
Adrian Roos [Thu, 3 Aug 2017 15:15:40 +0000 (15:15 +0000)]
Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev am:
a957c56da0
am:
49cbe41a2b
Change-Id: I9932c8175ad0e7dd46cfa15fc0c6a037023259b9
Android Build Merger (Role) [Thu, 3 Aug 2017 15:15:18 +0000 (15:15 +0000)]
Merge "Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am:
bc3c1d0170 am:
2674ad2e9a" into oc-mr1-dev-plus-aosp
Adrian Roos [Thu, 3 Aug 2017 15:13:27 +0000 (15:13 +0000)]
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am:
bc3c1d0170
am:
2674ad2e9a
Change-Id: I7089df088a5c7f684af50ede67dbd11df984fc5d
Adrian Roos [Thu, 3 Aug 2017 15:13:12 +0000 (15:13 +0000)]
Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev am:
a957c56da0
am:
14acc52213
Change-Id: I36772d64f0343a8a2155e992a924c89c904acdbe
Adrian Roos [Thu, 3 Aug 2017 15:10:36 +0000 (15:10 +0000)]
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am:
bc3c1d0170
am:
1a9c0c37aa
Change-Id: I0af701dfcab068695c3cfcf746b4e23694c20f60
Alexandru-andrei Rotaru [Thu, 3 Aug 2017 15:07:29 +0000 (15:07 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." into stage-aosp-master
Adrian Roos [Thu, 3 Aug 2017 15:05:16 +0000 (15:05 +0000)]
Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev
am:
a957c56da0
Change-Id: Ie526be7c78cff21fe18eb42c7130a9aa68dc961e
Adrian Roos [Thu, 3 Aug 2017 15:05:15 +0000 (15:05 +0000)]
Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev
am:
a957c56da0
Change-Id: I84627e6f4a5cc8ee0f1950977163a97b32c6954c
Adrian Roos [Thu, 3 Aug 2017 15:01:12 +0000 (15:01 +0000)]
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev
am:
bc3c1d0170
Change-Id: Id87a35597db82345e564fd4d92500b8dacdc0c23
Adrian Roos [Thu, 3 Aug 2017 15:01:04 +0000 (15:01 +0000)]
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev
am:
bc3c1d0170
Change-Id: I598d82fcd14702151a924dd481fa067613c76b0e
TreeHugger Robot [Thu, 3 Aug 2017 14:57:54 +0000 (14:57 +0000)]
Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 14:51:28 +0000 (14:51 +0000)]
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev
Alexandru-Andrei Rotaru [Thu, 3 Aug 2017 14:27:20 +0000 (14:27 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." am:
5027dd1026 -s ours am:
54c1b9e936 am:
1f12dd7bba
am:
a3c00447b7
Change-Id: Ica909191e8eb48aea72603bd6f795e449603931d
Alexandru-Andrei Rotaru [Thu, 3 Aug 2017 14:16:20 +0000 (14:16 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." am:
5027dd1026 -s ours am:
54c1b9e936
am:
1f12dd7bba
Change-Id: I0ed1fbe1e3430ea6132102ce0d6d347b5542e303
Kenny Guy [Wed, 2 Aug 2017 18:41:23 +0000 (19:41 +0100)]
Update colour to match toasts.
Toasts are now black on white so update
icon we use in the toast to be black.
Test: Manual
Bug:
64120926
Change-Id: Iae153b98e187f58e0a0ab5eb315860bc97437a7f
Alexandru-Andrei Rotaru [Thu, 3 Aug 2017 14:04:49 +0000 (14:04 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." am:
5027dd1026 -s ours
am:
54c1b9e936
Change-Id: I93d2bda3aacb51e1db8a03c4ebce90aeb4812506
Alexandru-Andrei Rotaru [Thu, 3 Aug 2017 13:53:53 +0000 (13:53 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed."
am:
5027dd1026 -s ours
Change-Id: I03d1d03f4e4e1b1dfcf68da3aa21913506739619
Alexandru-Andrei Rotaru [Tue, 18 Jul 2017 15:49:22 +0000 (16:49 +0100)]
Notify the user and turn off tethering when the service is disallowed.
Added UserRestrinctionListener for turning the service off one the
DISALLOW_CONFIG_TETHERING is on into Tethering. Added notification
about
tethering being turned off. Also added Unit Tests to test the
functionality
of the UserRestrictionListener added.
Bug:
27936525
Test: Turn the tehering service on (either wifi, usb or bluetooth).
Automatically the system should send a notification about the service
being active.Close settings from recents. From TestDPC User Restrictions
switch on DISALLOW_CONFIG_TETHERING. The tethering should be turned off
and a notification should appear informing that the service is inactive.
Merged-In: Ib7ea8885cedc2a842ebd4487c8b366a6666996bc
Change-Id: Ib7ea8885cedc2a842ebd4487c8b366a6666996bc
(cherry picked from commit
fa6d5c5ca02f1bfc454bd3cd82e6c043661e7aa7)
Pavel Grafov [Thu, 3 Aug 2017 13:10:49 +0000 (13:10 +0000)]
Merge "Move key eviction past system services user cleanup." into oc-mr1-dev
am:
03515d0ad2
Change-Id: I206f33be06a993bcaef2fc68aa2c83bef80e6488
Android Build Merger (Role) [Thu, 3 Aug 2017 13:04:17 +0000 (13:04 +0000)]
Merge "Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am:
48ed8aa4d0 am:
76136dcf45" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 3 Aug 2017 13:03:34 +0000 (13:03 +0000)]
Merge "Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am:
48ed8aa4d0 am:
e64d0028ae" into oc-mr1-dev-plus-aosp
Robert Carr [Thu, 3 Aug 2017 13:01:46 +0000 (13:01 +0000)]
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am:
48ed8aa4d0
am:
76136dcf45
Change-Id: I396e7552fd7c0a5c10e26c895c68bb54ca551f6b
Android Build Merger (Role) [Thu, 3 Aug 2017 13:01:19 +0000 (13:01 +0000)]
Merge "Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev am:
e8107cf358 am:
b993a3a01d" into oc-mr1-dev-plus-aosp
Robert Carr [Thu, 3 Aug 2017 13:01:15 +0000 (13:01 +0000)]
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am:
48ed8aa4d0
am:
e64d0028ae
Change-Id: Ib87b081ec02bfa030d0561cf12beac9d4b8ca692
TreeHugger Robot [Thu, 3 Aug 2017 12:59:57 +0000 (12:59 +0000)]
Merge "Move key eviction past system services user cleanup." into oc-mr1-dev
Adrian Roos [Thu, 3 Aug 2017 12:59:00 +0000 (12:59 +0000)]
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev am:
e8107cf358
am:
5398051267
Change-Id: Iaae94ae22c4d11648f410ccd7f307ddca84967ce
Adrian Roos [Thu, 3 Aug 2017 12:58:59 +0000 (12:58 +0000)]
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev am:
e8107cf358
am:
b993a3a01d
Change-Id: I41f6ab0a055ad149356287429fa0847e81db473a
Robert Carr [Thu, 3 Aug 2017 12:53:40 +0000 (12:53 +0000)]
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
am:
48ed8aa4d0
Change-Id: Ibee1aea584f3e4141806aad6c8e7a592ccc31503
Robert Carr [Thu, 3 Aug 2017 12:53:38 +0000 (12:53 +0000)]
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
am:
48ed8aa4d0
Change-Id: I3030c64c30f6c16dc9c8a01e21a5dc6b58cbd273
Adrian Roos [Thu, 3 Aug 2017 12:48:38 +0000 (12:48 +0000)]
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev
am:
e8107cf358
Change-Id: I2042c1d15844e34929286e91283ddb9942faea8f
Adrian Roos [Thu, 3 Aug 2017 12:48:33 +0000 (12:48 +0000)]
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev
am:
e8107cf358
Change-Id: I5bafabdfe40175ee15cd3258f1e0ed536a99f164
TreeHugger Robot [Thu, 3 Aug 2017 12:45:07 +0000 (12:45 +0000)]
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 12:34:59 +0000 (12:34 +0000)]
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev
Kenny Guy [Thu, 3 Aug 2017 12:30:53 +0000 (12:30 +0000)]
Update work briefcase asset.
am:
f74c2a6ff6
Change-Id: I127ca45f3a25de00bd8eac86dc2227ab3ad64dc3
sergeyv [Thu, 3 Aug 2017 11:58:20 +0000 (04:58 -0700)]
Update toast UI
- lighter background
- no text shadow
bug:
64236136,
64232075
Test: n/a
Change-Id: I4c57cc1f4f30efd6edf7b3cb405f0f7741f7d838
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 11:04:32 +0000 (11:04 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""" am:
82d2bd4e40 am:
f9caecd124 am:
be71148d49
am:
eefdc2c6f8
Change-Id: I8aa40435f0ad3477fef8f3c4650cdd30642acc91
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 10:52:34 +0000 (10:52 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""" am:
82d2bd4e40 am:
f9caecd124
am:
be71148d49
Change-Id: Ibd4c390c610b20f2809b06045fa38e6231175599
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 10:40:54 +0000 (10:40 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""" am:
82d2bd4e40
am:
f9caecd124
Change-Id: I69e18dc2838c9472b6962a181d3faa0873b27e38
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 10:30:05 +0000 (10:30 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."""
am:
82d2bd4e40
Change-Id: I8d1fe014fdc3cfd190c5ce95ec963fa8c038552c
Treehugger Robot [Thu, 3 Aug 2017 10:29:55 +0000 (10:29 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed."
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 10:15:24 +0000 (10:15 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."""
Kenny Guy [Tue, 20 Jun 2017 15:42:07 +0000 (16:42 +0100)]
Update work briefcase asset.
Bug:
36497538
Test: Manual - visually checked icons.
Change-Id: I1d5dd1b80bd32667e47dfc4a1c355a5106271d72
(cherry picked from commit
d49d28a8aee5ee00f5e8368bb1448b991608cf4a)
Hugo Benichi [Thu, 3 Aug 2017 07:28:16 +0000 (07:28 +0000)]
NsdManager: remove duplicated argument validation
am:
cf96a1b36d
Change-Id: I3cad605d34cd9612b6073e689dc4af04b1717413
Sungsoo Lim [Thu, 3 Aug 2017 05:01:57 +0000 (14:01 +0900)]
Catch IllegalArgumentException when disconnect
IllegalArgumentException can happen, if unbindService() is called
after the service is stopped.
Bug:
63439915
Test: Passed MediaBrowserTest
Change-Id: I70ecb9e907af66b9b65960dd4029e55e81639c03
Hugo Benichi [Tue, 2 May 2017 04:36:28 +0000 (13:36 +0900)]
NsdManager: remove duplicated argument validation
This patch simplifies argument validation in NsdManager public api and
regroup duplicated validation into common methods.
This makes stack traces more actionable as now specific errors will
cause the api to throw exception from specific methods, whereas before
IllegalArgumentException would be thrown from inside the same api method
for different reasons.
This patch also includes a couple of other small cleanups.
Test: $ runtest -x frameworks/base/tests/net/../NsdManagerTest.java
Bug:
37013369
(cherry picked from commit
ff3e6ccca1715ae72c6499cc7c894d27f46e8403)
Change-Id: Icf047532aa551fbe0a70721cfb95507eaa84d51e
Sungsoo Lim [Thu, 3 Aug 2017 04:36:22 +0000 (13:36 +0900)]
Do not call ItemCallback after disconnected
Bug:
64119114
Test: Passed MediaBrowserTest
Change-Id: Icf3283710abe7c03f4a73532b33ec2a306d2280b
Peter Qiu [Thu, 3 Aug 2017 04:36:31 +0000 (04:36 +0000)]
Merge "SettingsLib: wifi: add support for tracking carrier Wi-Fi APs" into oc-mr1-dev
am:
fca9a47ba8
Change-Id: I2e892a455ded1cb364eb449d35601c0ca3b7f02f