OSDN Git Service
Mady Mellor [Thu, 20 Jul 2017 00:09:05 +0000 (00:09 +0000)]
Merge "Fix snooze not dismissing when it should" into oc-dr1-dev
am:
f113a07d9e
Change-Id: I71e7c2757c1fab1dfdcd59ab3dbf695179899fe7
Seigo Nonaka [Thu, 20 Jul 2017 00:04:16 +0000 (00:04 +0000)]
Merge "Fix race condition of removing surface." into oc-dr1-dev
am:
e6685b2bcd
Change-Id: I3677cb6f07b2a7c60e72b3f70034fec42adb6dec
TreeHugger Robot [Thu, 20 Jul 2017 00:00:46 +0000 (00:00 +0000)]
Merge "Fix snooze not dismissing when it should" into oc-dr1-dev
Seigo Nonaka [Wed, 19 Jul 2017 23:54:11 +0000 (23:54 +0000)]
Merge "Fix race condition of removing surface." into oc-dr1-dev
Selim Cinek [Wed, 19 Jul 2017 23:47:16 +0000 (23:47 +0000)]
Merge "Reducing bitmap sizes in notifications" into oc-dr1-dev
am:
8ffa981686
Change-Id: I20fbb857570c0e7bb02659b9026b0800d5939bc2
Selim Cinek [Wed, 19 Jul 2017 23:41:44 +0000 (23:41 +0000)]
Merge "Reducing bitmap sizes in notifications" into oc-dr1-dev
Lucas Dupin [Wed, 19 Jul 2017 23:38:35 +0000 (23:38 +0000)]
Merge "Smoother system bars color transition" into oc-dr1-dev
am:
b0bf1d479f
Change-Id: I264126a80f723a26fdaa2562afdfcdc51b4a97c0
Lucas Dupin [Wed, 19 Jul 2017 23:32:04 +0000 (23:32 +0000)]
Merge "Smoother system bars color transition" into oc-dr1-dev
Sungsoo Lim [Wed, 19 Jul 2017 22:52:10 +0000 (22:52 +0000)]
Merge "Type check before casting from CookieHandler to CookieManager" into oc-dr1-dev
am:
925abb706e
Change-Id: I50b447cc5aa86dc32787ff6dc0d5f71e3c042367
John Eckerdal [Wed, 19 Jul 2017 22:49:21 +0000 (22:49 +0000)]
Merge "Select correct oat/odex when pinning the Camera APK" into oc-dr1-dev
am:
1a7d4c25b3
Change-Id: I230dfa9275ad5d873a0ce9e3fba201f0bbf01af2
Sungsoo Lim [Wed, 19 Jul 2017 22:41:02 +0000 (22:41 +0000)]
Merge "Type check before casting from CookieHandler to CookieManager" into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 22:40:32 +0000 (22:40 +0000)]
Merge "Select correct oat/odex when pinning the Camera APK" into oc-dr1-dev
Ahmed ElArabawy [Wed, 19 Jul 2017 22:11:40 +0000 (22:11 +0000)]
Merge "Add Configuration to APF Policy" into oc-dr1-dev
am:
1da6af31ff
Change-Id: I16346bb98a0b9259f7c3f51e318c472cfc1bb492
TreeHugger Robot [Wed, 19 Jul 2017 22:02:09 +0000 (22:02 +0000)]
Merge "Add Configuration to APF Policy" into oc-dr1-dev
Lucas Dupin [Wed, 19 Jul 2017 18:48:15 +0000 (18:48 +0000)]
Merge "Default gradient should be the dark version" into oc-dr1-dev
am:
4dfb200d1b
Change-Id: I72a0674c9a180f65536553e30f80317276073365
Mady Mellor [Wed, 19 Jul 2017 17:52:47 +0000 (10:52 -0700)]
Fix snooze not dismissing when it should
Simply check whether the guts is a leavebehind, if it is allow it to
be dismissed.
Test: manual - snooze a notification, touch outside note that it disappears
- show notification controls on a notification that will
be removed, note that the controls remain, once 'done' is
hit the notification is removed
Bug:
63788509
Change-Id: I42c97239f4e3e17f2e69322c94bd8e8f9d7f0737
TreeHugger Robot [Wed, 19 Jul 2017 18:40:38 +0000 (18:40 +0000)]
Merge "Default gradient should be the dark version" into oc-dr1-dev
Sungsoo Lim [Mon, 17 Jul 2017 21:24:26 +0000 (14:24 -0700)]
Type check before casting from CookieHandler to CookieManager
CookieHandler.getDefault() doesn't always return CookieManager.
Bug:
63638018
Test: pass StreamingMediaPlayerTest#testHlsWithHeadersCookies
Test: manual with a test app
Change-Id: Ie7c19d38f779813f3fffb9abbcb3188a0fca3f45
Seigo Nonaka [Tue, 18 Jul 2017 03:22:44 +0000 (20:22 -0700)]
Fix race condition of removing surface.
mContainer.startingSurface can be replaced between posting
mRemoveStartingWindow and actually surface.remove() is called.
1. removeStartingWindow is called, then mRemoveStartingWindow is posted
to mHandler
2. transferStartingWindow is called, then mContainer.startingWindow is
replaced with new surface.
3. mHandler pops the callback and surface.remove() is called.
Here the remove is only called for replaced surface and never called for
older surface.
To fix this issue, surely removes the surface when the
removeStartingWindow is called.
Bug:
63156080
Bug:
63784898
Test: Watch /proc/<pid>/fd
Change-Id: I55e2c1b8fba32b3a19603e6ad4743f07576abd48
Badhri Jagan Sridharan [Wed, 19 Jul 2017 18:11:25 +0000 (18:11 +0000)]
Merge "Always reevaluate whether to show the notification for USB_DEVICE_* intents" into oc-dr1-dev
am:
d5f442d65b
Change-Id: I00374ea814200a8142e208f9fa2f7b7e2a45f4b0
Selim Cinek [Tue, 11 Jul 2017 11:19:59 +0000 (13:19 +0200)]
Reducing bitmap sizes in notifications
Bitmap sizes could be arbitrary large when they were sent
over to the system. We're now reducing them to reasonable
sizes.s
Also fixed that notification bitmaps were not put into
ashmem anymore since it got lost in a refactor.
Test: code inspection
Bug:
62319200
Merged-In: I87db7656e749666b9eab1f67fd497f155c407e18
Change-Id: I87db7656e749666b9eab1f67fd497f155c407e18
TreeHugger Robot [Wed, 19 Jul 2017 18:01:26 +0000 (18:01 +0000)]
Merge "Always reevaluate whether to show the notification for USB_DEVICE_* intents" into oc-dr1-dev
George Burgess IV [Wed, 19 Jul 2017 17:49:54 +0000 (17:49 +0000)]
Merge "Fix static analyzer complaints" am:
a3bde81205 am:
3e0a8b1d2b
am:
c6c395b6b1
Change-Id: I6b2e0d2f2aa60b347699e7149a0c2af3ea0f6c93
George Burgess IV [Wed, 19 Jul 2017 17:41:55 +0000 (17:41 +0000)]
Merge "Fix static analyzer complaints" am:
a3bde81205
am:
3e0a8b1d2b
Change-Id: Ia66a6a5ab4fd59772a5df71ede75227d353e5d25
George Burgess IV [Wed, 19 Jul 2017 17:36:23 +0000 (17:36 +0000)]
Merge "Fix static analyzer complaints"
am:
a3bde81205
Change-Id: I39f7b56c6abc0398cd517eef174b0620dbc50caa
Treehugger Robot [Wed, 19 Jul 2017 17:26:36 +0000 (17:26 +0000)]
Merge "Fix static analyzer complaints"
Beverly [Wed, 19 Jul 2017 15:26:12 +0000 (15:26 +0000)]
Merge ""Block notifications screen off" setting is used" into oc-dr1-dev
am:
dc7b2bc5e3
Change-Id: I4d2f9058da7dfec5197edb6f7e25ed2d889ff756
TreeHugger Robot [Wed, 19 Jul 2017 15:21:32 +0000 (15:21 +0000)]
Merge ""Block notifications screen off" setting is used" into oc-dr1-dev
Carlos Vinueza [Wed, 19 Jul 2017 14:37:59 +0000 (14:37 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes" am:
1585b2e7b7 am:
3a6a8b9baa
am:
263e83370e
Change-Id: Iaa2f0574fd83fb1cbe6bfbe65424e12e10b1076f
Carlos Vinueza [Wed, 19 Jul 2017 14:33:04 +0000 (14:33 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes" am:
1585b2e7b7
am:
3a6a8b9baa
Change-Id: I61ae7d0404463c160dd22675c84b0782f33a3c5d
Jorim Jaggi [Wed, 19 Jul 2017 14:27:38 +0000 (14:27 +0000)]
Merge "Fixes for increased usage of light navigation bar" into oc-dr1-dev
am:
3dc5e0ae3a
Change-Id: Ied6d9ca3f60b66aceebb326c536aea0267d166ad
Carlos Vinueza [Wed, 19 Jul 2017 14:26:55 +0000 (14:26 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes"
am:
1585b2e7b7
Change-Id: Ia85bdccb4c6b15c6b5b7974f4cb5cc34af04d8d1
TreeHugger Robot [Wed, 19 Jul 2017 14:19:54 +0000 (14:19 +0000)]
Merge "Fixes for increased usage of light navigation bar" into oc-dr1-dev
Treehugger Robot [Wed, 19 Jul 2017 14:13:36 +0000 (14:13 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes"
Christine Franks [Wed, 19 Jul 2017 14:06:05 +0000 (14:06 +0000)]
Merge "Add new configuration values for demo mode" into oc-dr1-dev
am:
f2dc5c69a4
Change-Id: I84a07c360044384b397767c29ac3751060c60900
Christine Franks [Wed, 19 Jul 2017 13:59:22 +0000 (13:59 +0000)]
Merge "Add new configuration values for demo mode" into oc-dr1-dev
Jorim Jaggi [Wed, 19 Jul 2017 13:19:55 +0000 (13:19 +0000)]
Merge "Add log when we are trying to dismiss keyguard" into oc-dr1-dev
am:
f89512c731
Change-Id: If62e97a3a85d1cc0748fb40f91b233104f000e85
TreeHugger Robot [Wed, 19 Jul 2017 13:11:26 +0000 (13:11 +0000)]
Merge "Add log when we are trying to dismiss keyguard" into oc-dr1-dev
Jorim Jaggi [Wed, 19 Jul 2017 11:52:02 +0000 (11:52 +0000)]
Merge "Send app transition starting event at right time" into oc-dr1-dev
am:
790e3ff6e3
Change-Id: Iadada99fc926de016dc78b1a82270ceda5039066
TreeHugger Robot [Wed, 19 Jul 2017 11:45:50 +0000 (11:45 +0000)]
Merge "Send app transition starting event at right time" into oc-dr1-dev
Jorim Jaggi [Wed, 19 Jul 2017 11:14:18 +0000 (11:14 +0000)]
Fix wrong nav bar animation when unlocking from AOD
am:
f5304ad7be
Change-Id: I19e8db94e2ad70c8d6e267b0a85e6885cf80305b
Jorim Jaggi [Mon, 17 Jul 2017 16:31:13 +0000 (18:31 +0200)]
Fix wrong nav bar animation when unlocking from AOD
Visibility of navigation bar was set too late. Set it earlier
such that it gets the right animation.
In addition to that, fixes a bug where Keyguard unlock animation
was terminated too early if there was already a scrim animation
pending.
Test: Wake-and-unlock from Aod
Bug:
63726451
Change-Id: I9a45fb27db68d56904c0fade40ea1173176beae8
Jorim Jaggi [Mon, 17 Jul 2017 14:46:00 +0000 (16:46 +0200)]
Fixes for increased usage of light navigation bar
- Fix an issue where IME doesn't really cover nav area but still
became window to deterine light navigation.
- Only invert nav bar icons when expanding the shade if the scrim
is dark.
- Fix logic such that status bar always becomes the window to
dermine light nav bar on lockscreen.
Test: Open shade with light nav
Test: Open Keyguard in landscape in all apps
Test: Unlock phone with light nav
Change-Id: If024a8b81942a6675243b703c0509cd88de8d932
Fixes:
63539478
Fixes:
63533427
Fixes:
63577858
Jorim Jaggi [Wed, 19 Jul 2017 10:25:27 +0000 (10:25 +0000)]
Merge "Fix threading issue with splash screens" into oc-dr1-dev
am:
ffc3f50b02
Change-Id: I20e456309ddae5f1a75b309726807295c414a6d3
Jorim Jaggi [Wed, 19 Jul 2017 10:17:37 +0000 (10:17 +0000)]
Merge "Fix threading issue with splash screens" into oc-dr1-dev
Neil Fuller [Wed, 19 Jul 2017 10:01:47 +0000 (10:01 +0000)]
Merge "Re-enable some test cases" am:
8feaad7249 am:
a76d88d26d
am:
450c3bc1cd
Change-Id: I89a31203310c0ea130b9a4f70656a2f81f372c34
Neil Fuller [Wed, 19 Jul 2017 09:56:17 +0000 (09:56 +0000)]
Merge "Re-enable some test cases" am:
8feaad7249
am:
a76d88d26d
Change-Id: I03fcdebbe246fcffb92b7598d3084b3383982d98
Neil Fuller [Wed, 19 Jul 2017 09:51:17 +0000 (09:51 +0000)]
Merge "Re-enable some test cases"
am:
8feaad7249
Change-Id: I1b86866748afa6d6014abcbf59116a7abf67b54e
Neil Fuller [Wed, 19 Jul 2017 09:40:52 +0000 (09:40 +0000)]
Merge "Re-enable some test cases"
Jorim Jaggi [Tue, 18 Jul 2017 11:22:52 +0000 (13:22 +0200)]
Send app transition starting event at right time
Otherwise we are skipping an important section of the code that
might contain delays.
Test: Go to recents, check app transition delay in eventlog
Change-Id: Ie9ccc1dd37f1a0ffeb7c18a410a5148dbfb02ccf
Fixes:
63793419
Hugo Benichi [Wed, 19 Jul 2017 08:15:12 +0000 (08:15 +0000)]
Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" am:
24a2adfa27 am:
f6883504c2
am:
b1894abbc5
Change-Id: I458a0fdae874039e0f1d5cd38ed8ad0a1754bba9
Hugo Benichi [Wed, 19 Jul 2017 08:09:38 +0000 (08:09 +0000)]
Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" am:
24a2adfa27
am:
f6883504c2
Change-Id: I432f419d1c8f93136a76cbadfd32018294b3e3d7
Hugo Benichi [Wed, 19 Jul 2017 08:04:48 +0000 (08:04 +0000)]
Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone"
am:
24a2adfa27
Change-Id: I4be1d2ce67871c1e01364beca886fdd3af374321
Treehugger Robot [Wed, 19 Jul 2017 07:54:45 +0000 (07:54 +0000)]
Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone"
Hugo Benichi [Wed, 19 Jul 2017 01:10:52 +0000 (10:10 +0900)]
ConnectivityServiceTest: fix testNetworkInfoOfTypeNone
This patch fixes a couple of flakyness issues with
testNetworkInfoOfTypeNone. It also fixes some typos and naming issues.
Bug:
62918393,
62918393
Test: runtest frameworks-net
Change-Id: I1c56557ab113d3ef57dbc06a6e882634d03c5b09
Android Build Merger (Role) [Wed, 19 Jul 2017 04:53:38 +0000 (04:53 +0000)]
Merge "Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev am:
8e644a7510 am:
04b48078e8" into oc-dr1-dev-plus-aosp
Ricardo Loo [Wed, 19 Jul 2017 04:52:28 +0000 (04:52 +0000)]
Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev am:
8e644a7510
am:
04b48078e8
Change-Id: Id6a3179c4acc9f33174b8b83b406d59bd8129331
Ricardo Loo [Wed, 19 Jul 2017 04:52:24 +0000 (04:52 +0000)]
Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev am:
8e644a7510
am:
73f94e7896
Change-Id: I5f6181c026d443357226f6b7e5332a754b130476
Ricardo Loo [Wed, 19 Jul 2017 04:44:53 +0000 (04:44 +0000)]
Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev
am:
8e644a7510
Change-Id: I3d1a700fe2f5061601c8c874317da4f42ad83772
Ricardo Loo [Wed, 19 Jul 2017 04:44:52 +0000 (04:44 +0000)]
Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev
am:
8e644a7510
Change-Id: Ib12f6abb1cd3bdc4701b13e607288fcaf48ce43e
Lucas Dupin [Wed, 19 Jul 2017 04:40:28 +0000 (21:40 -0700)]
Smoother system bars color transition
Easing out too fast makes the status bar feel like it's flashing.
Test: visual
Change-Id: I3c6fb528efd22d13f890024e73b76d2e50d71163
Fixes:
63629289
Ricardo Loo [Wed, 19 Jul 2017 04:36:42 +0000 (04:36 +0000)]
Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev
Chen Xu [Wed, 19 Jul 2017 03:12:33 +0000 (03:12 +0000)]
Merge "initial value for data_roaming based on carrier" into oc-dr1-dev
am:
068397a319
Change-Id: I5c65666208e834a5b0ad5280f1670a0d7b31aa31
Chen Xu [Wed, 19 Jul 2017 03:06:01 +0000 (03:06 +0000)]
Merge "initial value for data_roaming based on carrier" into oc-dr1-dev
Steven Moreland [Wed, 19 Jul 2017 02:41:21 +0000 (02:41 +0000)]
Reference nativehelper/jni.h as jni.h am:
d82cdb4624
am:
6b9d4b76ae
Change-Id: I27f7f300b0a4e3d8d8d150e7902ed2763b442a4b
Steven Moreland [Wed, 19 Jul 2017 02:36:09 +0000 (02:36 +0000)]
Reference nativehelper/jni.h as jni.h
am:
d82cdb4624
Change-Id: I0c83f089c388f2e967323a0e74a8582904cb4cbd
Steven Moreland [Tue, 18 Jul 2017 02:00:43 +0000 (19:00 -0700)]
Reference nativehelper/jni.h as jni.h
nativehelper will no longer export nativehelper/jni.h so that everywhere
can reference this file with the same name.
Bug:
63762847
Change-Id: I3e58d478a2eb17b19db540414545a3c1f9c381af
(cherry picked from commit
98f40c71399e63f2b10cf6e3dffbbcea84d52490)
Android Build Merger (Role) [Wed, 19 Jul 2017 01:29:37 +0000 (01:29 +0000)]
Merge "Merge "Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours am:
ea6aaed42d" into oc-dev-plus-aosp am:
6ba27f079f" into oc-dr1-dev-plus-aosp
Phil Weaver [Wed, 19 Jul 2017 01:28:07 +0000 (01:28 +0000)]
Merge "Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours am:
ea6aaed42d" into oc-dev-plus-aosp
am:
6ba27f079f
Change-Id: Ifcce5af8b05a67ea61688d059a397021fdc7517b
Android Build Merger (Role) [Wed, 19 Jul 2017 01:25:53 +0000 (01:25 +0000)]
Merge "Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours am:
ea6aaed42d am:
cbc1e6afe9" into oc-dr1-dev-plus-aosp
Phil Weaver [Wed, 19 Jul 2017 01:24:21 +0000 (01:24 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours am:
ea6aaed42d
am:
cbc1e6afe9
Change-Id: Id52ab73ff87b5045bd3ccebd93343cf18712bfb1
Hugo Benichi [Wed, 19 Jul 2017 01:22:59 +0000 (01:22 +0000)]
Merge "IpManager: fix test for default ProvisioningConfiguration" am:
2627d4856b am:
361162b636
am:
fe88fa947e
Change-Id: I4bbbf0997f5bf9a1ebba1eb9968471fff9f297fe
Android Build Merger (Role) [Wed, 19 Jul 2017 01:19:41 +0000 (01:19 +0000)]
Merge "Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours am:
ea6aaed42d" into oc-dev-plus-aosp
Phil Weaver [Wed, 19 Jul 2017 01:19:03 +0000 (01:19 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours
am:
ea6aaed42d
Change-Id: If720a3669b9d04ea115609bac0e1e60d5a7bc291
Phil Weaver [Wed, 19 Jul 2017 01:17:50 +0000 (01:17 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours
am:
ea6aaed42d
Change-Id: I15d2da6b1acf1eb2b6b5126d04dd67274e7230fb
Hugo Benichi [Wed, 19 Jul 2017 01:15:12 +0000 (01:15 +0000)]
Merge "IpManager: fix test for default ProvisioningConfiguration" am:
2627d4856b
am:
361162b636
Change-Id: Id72cd94c481bdc106ed022582399687b9abcc22b
Phil Weaver [Wed, 19 Jul 2017 01:10:58 +0000 (01:10 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028
am:
72c56fb84a -s ours
Change-Id: Ib0b35737306bce22a49bddeea0d7abdc8ecb1bc3
Hugo Benichi [Wed, 19 Jul 2017 01:06:59 +0000 (01:06 +0000)]
Merge "IpManager: fix test for default ProvisioningConfiguration"
am:
2627d4856b
Change-Id: I087aee995858ae898f5d660c11552724a07503c3
Android Build Merger (Role) [Wed, 19 Jul 2017 01:05:36 +0000 (01:05 +0000)]
Merge "Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5 am:
d761dad216 am:
a81076b2e8 am:
ad737afc4c" into oc-dr1-dev-plus-aosp
Phil Weaver [Wed, 19 Jul 2017 01:04:15 +0000 (01:04 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5 am:
d761dad216 am:
a81076b2e8
am:
ad737afc4c
Change-Id: I9a9f962ec81d72e3432d4c6b71e99db3279b78d8
Phil Weaver [Wed, 19 Jul 2017 01:02:01 +0000 (01:02 +0000)]
Merge "Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5 am:
d761dad216 am:
a81076b2e8" into oc-dr1-dev
am:
54cf73ebd9
Change-Id: Ib6dab0953e81ce350e08fbe70df86e836d58a2c1
Phil Weaver [Wed, 19 Jul 2017 01:01:06 +0000 (01:01 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d
am:
a84f7a3028
Change-Id: I1fedbee4642373e41c63c36ab83a0f4629c4a3d1
Romain Guy [Wed, 19 Jul 2017 01:00:13 +0000 (01:00 +0000)]
Merge "Put generated/compiled graphics code in getCodeCacheDir()" into oc-dr1-dev
am:
e00bcc0fef
Change-Id: I300fa41c30c64f22c47d164f3b6d6d698e34302f
Treehugger Robot [Wed, 19 Jul 2017 00:58:11 +0000 (00:58 +0000)]
Merge "IpManager: fix test for default ProvisioningConfiguration"
Android Build Merger (Role) [Wed, 19 Jul 2017 00:56:36 +0000 (00:56 +0000)]
Merge "Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5 am:
d761dad216 am:
a81076b2e8" into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 00:55:42 +0000 (00:55 +0000)]
Merge "Put generated/compiled graphics code in getCodeCacheDir()" into oc-dr1-dev
Phil Weaver [Wed, 19 Jul 2017 00:53:13 +0000 (00:53 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev
am:
4a1dc3458d
Change-Id: Ibc50787c078b4d68de37f12d57d4b14990b5c768
Phil Weaver [Wed, 19 Jul 2017 00:52:23 +0000 (00:52 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5 am:
d761dad216
am:
a81076b2e8
Change-Id: I91ec75b1c21fc278c2bb723cf791cae1e94f52ec
Phil Weaver [Wed, 19 Jul 2017 00:47:59 +0000 (00:47 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5 am:
d761dad216
am:
a81076b2e8
Change-Id: I1601d89e5c39e68361b03dff475f312d0e7fc22e
Phil Weaver [Wed, 19 Jul 2017 00:46:42 +0000 (00:46 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev
Badhri Jagan Sridharan [Wed, 19 Jul 2017 00:29:10 +0000 (17:29 -0700)]
Always reevaluate whether to show the notification for USB_DEVICE_* intents
The decision whether to show or hide the "Usb supplying power.."
notification is based on two different broadcasts
1. USB_DEVICE_ATTACHED/DETACHED
2. USB_PORT_CHANGED
Depending on how long the port takes to enumerate, the required
intents might arrive in different order. Previously, it was assumed
that the ATTACHED broadcast would arrive before the PORT_CHANGED
broadcast and the code was aggressive to reduce the number of
times the decision to display/hide the notification is made.
This might cause the notification to be displayed in some instances
when it is not supposed to be displayed. This CL makes the usb service
to always reevaluate whenever USB_DEVICE_ATTACHED/DETACHED is
received.
Also, adding logs to print whenever the notification in enqueued/
dequeued.
Bug:
63785369
Test: Verified that the notification is displayed when connecting
to another pixel device and hidden when mouse or headset is
connected.
Change-Id: I30650a2d9923d01a1fce4b9450e65ec7f4e6557b
Phil Weaver [Wed, 19 Jul 2017 00:42:05 +0000 (00:42 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5
am:
d761dad216
Change-Id: Ib2704ba352764d6f48467c129b2a2d4129408da0
fionaxu [Fri, 23 Jun 2017 01:14:23 +0000 (18:14 -0700)]
initial value for data_roaming based on carrier
1. new carrier config for default data roaming value
to support carrier specific feature: turn on data_roaming by default.
Bug:
36193933
Test: manual test
Change-Id: Ie4f3a0714059e1a7257c84802db475c92c17e1b3
Phil Weaver [Wed, 19 Jul 2017 00:30:58 +0000 (00:30 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a
am:
2da30457c5
Change-Id: If6d698d3d085c8a49a4b58ae5cc5005264558091
Phil Weaver [Wed, 19 Jul 2017 00:24:23 +0000 (00:24 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3
am:
edbe4bd86a
Change-Id: I860d4a27acab50bfebf81e83b3db64f7c396fade
Phil Weaver [Wed, 19 Jul 2017 00:15:34 +0000 (00:15 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548
am:
afdcad0df3
Change-Id: Ie777e6351ed8518a4fc785a20772a8e2cb0ef0fe
Phil Weaver [Wed, 19 Jul 2017 00:04:51 +0000 (00:04 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours
am:
9e39e1e548
Change-Id: I04ba3782f29c89032d498c5e2ef292605a66ac9f
Phil Weaver [Tue, 18 Jul 2017 23:58:28 +0000 (23:58 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4
am:
996bc6bc12 -s ours
Change-Id: Iccbeb4cec6e40c00e7f875b5e3faa94772f1b819
Android Build Merger (Role) [Tue, 18 Jul 2017 23:52:59 +0000 (23:52 +0000)]
Merge "Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" am:
777c408a22 am:
6b0e6946c3 am:
dbc78509ae" into oc-dr1-dev-plus-aosp
Robert Quattlebaum [Tue, 18 Jul 2017 23:51:04 +0000 (23:51 +0000)]
Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" am:
777c408a22 am:
6b0e6946c3
am:
dbc78509ae
Change-Id: I017036f8c63ea1e9c1934daad55ef087b3a83012
OSDN Git Service
