OSDN Git Service
Laura Davis [Mon, 25 Jun 2018 21:37:54 +0000 (14:37 -0700)]
Merge "docs: fixed broken link" into pi-dev
am:
e07aeea926
Change-Id: I02ad0efff278079682ff7eb63c06d0bf17be8ca1
Laura Davis [Mon, 25 Jun 2018 21:27:48 +0000 (21:27 +0000)]
Merge "docs: fixed broken link" into pi-dev
Laura Davis [Mon, 25 Jun 2018 21:03:32 +0000 (14:03 -0700)]
Merge "docs: fixed typo in deprecation message" into pi-dev
am:
0dabb070b8
Change-Id: I74d4d900bd4b978791a1ca5c30b6f17fb3cb700b
Matthew Ng [Mon, 25 Jun 2018 20:54:19 +0000 (13:54 -0700)]
Merge "Quick scrub has gradient follow user drag" into pi-dev
am:
5f5c6e993f
Change-Id: I173202bab30b6b8b5c45d1841a5070cb0d282a04
Laura Davis [Mon, 25 Jun 2018 20:46:59 +0000 (20:46 +0000)]
Merge "docs: fixed typo in deprecation message" into pi-dev
TreeHugger Robot [Mon, 25 Jun 2018 20:39:46 +0000 (20:39 +0000)]
Merge "Quick scrub has gradient follow user drag" into pi-dev
Laura Davis [Mon, 25 Jun 2018 20:21:41 +0000 (13:21 -0700)]
Merge "docs: fixed broken link" into pi-dev
am:
0f949c4f9c
Change-Id: I77ef449243f094477d009cb94a595e5fb8624ef0
Laura Davis [Mon, 25 Jun 2018 20:09:17 +0000 (20:09 +0000)]
Merge "docs: fixed broken link" into pi-dev
Brad Ebinger [Mon, 25 Jun 2018 18:53:41 +0000 (11:53 -0700)]
Merge "Fix Possible Deadlock with getFeatureState" am:
6bebb8418c
am:
057f582e09
Change-Id: I3cb9d6457c0348739e57802099c51b0308bbe05d
Brad Ebinger [Mon, 25 Jun 2018 18:45:32 +0000 (11:45 -0700)]
Merge "Fix Possible Deadlock with getFeatureState"
am:
6bebb8418c
Change-Id: I675c116e54d961971d4a32f87dd247cca51b5069
Pavel Grafov [Mon, 25 Jun 2018 18:45:17 +0000 (11:45 -0700)]
Restore separate challenge state on error
am:
f10ae7e731
Change-Id: I70957dae31bbe98f8286d9c96bccd002f0acdf01
Matthew Ng [Tue, 12 Jun 2018 23:42:11 +0000 (16:42 -0700)]
Quick scrub has gradient follow user drag
Removed the track drawable and draws a gradient translated to the
position of the drag of the user as the track's background.
Test: quickscrub
Change-Id: Iee893e5f96f4954c77307c5ff9b762a04bd7de9a
Fixes:
109882517
Brad Ebinger [Mon, 25 Jun 2018 17:30:02 +0000 (17:30 +0000)]
Merge "Fix Possible Deadlock with getFeatureState"
Erik Kline [Mon, 25 Jun 2018 13:33:21 +0000 (06:33 -0700)]
[automerger skipped] Merge "Prefer default Internet network for upstream tethering." am:
3580a6a996
am:
fc1bde9261 -s ours
Change-Id: I965178ec99083dcd907841b4959e456f6d492516
Erik Kline [Mon, 25 Jun 2018 13:24:22 +0000 (06:24 -0700)]
Merge "Prefer default Internet network for upstream tethering."
am:
3580a6a996
Change-Id: I0990d077627aed71b03e7aa40a8acc460448a774
Treehugger Robot [Mon, 25 Jun 2018 12:08:46 +0000 (12:08 +0000)]
Merge "Prefer default Internet network for upstream tethering."
Pavel Grafov [Mon, 25 Jun 2018 11:13:38 +0000 (12:13 +0100)]
Restore separate challenge state on error
Otherwise if something goes wrong when tying the profile to the primary
user, challenge will remain in inconsistent state and the user won't
be able to unlock the profile.
Bug:
110262879
Test: manual, unified both compliant and uncompliant challenge.
Change-Id: I2bea3867541f43cbabd5cabbe8a0f61acc2602ca
Erik Kline [Thu, 14 Jun 2018 08:36:40 +0000 (17:36 +0900)]
Prefer default Internet network for upstream tethering.
Rather than use the crufty config.xml list of upstream transport types,
use ConnectivityService's notion of the default network for the upstream.
In cases where a DUN network is required and the default network is
currently a mobile network, look for a DUN network (code in Tethering
is currently responsible for requesting one).
Test: as follows
- built, flashed, booted
- runtest frameworks-net
- tethered via mobile, joined captive portal network, maintained
laptop access via mobile until captive passed (then used wifi)
- disabled client mode wifi, disabled mobile data, plugged in
ethernet adapter, observed connectivity via ethernet
Bug:
32163131
Bug:
62648872
Bug:
63282480
Bug:
109786760
Bug:
110118584
Bug:
110260419
Merged-In: I9cddf1fb7aa3b8d56bf048c563556244e74808c2
Merged-In: Icac3e5e20e99093ddb85aae1ca07ed7b5cf309fd
Change-Id: I925b75994e31df8046f3ef9916a2457b4210485e
(cherry picked from commit
4080a1bd15572caf149762e45c958627feceb74d)
Lucas Dupin [Sat, 23 Jun 2018 08:17:10 +0000 (01:17 -0700)]
Merge "Conserve expansion after re-inflation" into pi-dev
am:
0eb2be3a67
Change-Id: I44f868df5cafeac3bef09586403cf955bad1e581
TreeHugger Robot [Sat, 23 Jun 2018 08:05:06 +0000 (08:05 +0000)]
Merge "Conserve expansion after re-inflation" into pi-dev
Lucas Dupin [Thu, 21 Jun 2018 18:41:34 +0000 (11:41 -0700)]
Conserve expansion after re-inflation
We were updating most of the PhoneStatusBarView state during
re-inflation but not the expansion and its fraction.
Test: Pull down shade, run: adb shell service call overlay 4 s16 "com.android.systemui.theme.dark" i32 1 i32 0
Test: Switch to guest user, switch back
Test: Reboot, look at status bar
Change-Id: I41669fb32419ad02a11586ba248a68b47d450413
Merged-In: I41669fb32419ad02a11586ba248a68b47d450413
Fixes:
110530608
Fixes:
110147405
Fixes:
79122419
Emilian Peev [Sat, 23 Jun 2018 00:22:01 +0000 (17:22 -0700)]
Merge "Camera: Update surface sharing format restrictions" into pi-dev
am:
a749cd584e
Change-Id: I501835fdbc828564c0a06157c970853ed142896a
TreeHugger Robot [Sat, 23 Jun 2018 00:11:04 +0000 (00:11 +0000)]
Merge "Camera: Update surface sharing format restrictions" into pi-dev
Brad Ebinger [Thu, 21 Jun 2018 17:18:21 +0000 (10:18 -0700)]
Fix Possible Deadlock with getFeatureState
Use the ImsFeature lock for concurrency in MmTelFeature
instead of declaring its own lock.
Also, fixed up some other concurrency code.
Bug:
110507525
Test: Manual, Telephony Unit Tests
Change-Id: I5a7ef1beca619873a7c228bed0e1b82843d4de63
Kevin Hufnagle [Fri, 22 Jun 2018 22:50:04 +0000 (15:50 -0700)]
Merge "docs: Edited UNINSTALL_SHORTCUT permission desc." into pi-dev
am:
d2aadbfd93
Change-Id: I38378cf68c2ab2e16fdc35504b44114e6648de42
Laura Davis [Mon, 11 Jun 2018 17:33:17 +0000 (10:33 -0700)]
docs: fixed typo in deprecation message
Test: make ds-docs
Bug:
68303139
Change-Id: I7fc9f35bc118f8b661740a46f52d62beea1e67f1
Kevin Hufnagle [Fri, 22 Jun 2018 21:58:38 +0000 (21:58 +0000)]
Merge "docs: Edited UNINSTALL_SHORTCUT permission desc." into pi-dev
Matthew Ng [Fri, 22 Jun 2018 19:36:26 +0000 (12:36 -0700)]
Merge "Allow quickscrub after deadzone consumes touch" into pi-dev
am:
95b7c25a58
Change-Id: Id2e3d7e859a47936a63ebb5875bda69fbb64c816
TreeHugger Robot [Fri, 22 Jun 2018 19:24:08 +0000 (19:24 +0000)]
Merge "Allow quickscrub after deadzone consumes touch" into pi-dev
Andrii Kulian [Fri, 22 Jun 2018 18:48:11 +0000 (11:48 -0700)]
Merge "Skip updating stack config if it is detached from a display" into pi-dev
am:
3a09ade4d1
Change-Id: Iad7554e7b893563a23a0adb2a4174199ea55beb2
Rebecca Silberstein [Fri, 22 Jun 2018 18:26:10 +0000 (11:26 -0700)]
Merge "SettingsBackupAgent: notify of apBand conversion" into pi-dev
am:
cbf554b78b
Change-Id: I7f717d4d6d8a836fc86d67cc453a464830865508
Andrii Kulian [Fri, 22 Jun 2018 18:14:25 +0000 (18:14 +0000)]
Merge "Skip updating stack config if it is detached from a display" into pi-dev
TreeHugger Robot [Fri, 22 Jun 2018 17:52:26 +0000 (17:52 +0000)]
Merge "SettingsBackupAgent: notify of apBand conversion" into pi-dev
Amin Shaikh [Fri, 22 Jun 2018 17:23:46 +0000 (10:23 -0700)]
Merge "Do not announce selected state for QS tiles." into pi-dev
am:
bd62416618
Change-Id: I5336f81eed377c9d3dfe5932f91fe97a3f91108a
TreeHugger Robot [Fri, 22 Jun 2018 17:12:54 +0000 (17:12 +0000)]
Merge "Do not announce selected state for QS tiles." into pi-dev
Julia Reynolds [Fri, 22 Jun 2018 15:29:21 +0000 (08:29 -0700)]
Merge "Remove managed profile toast" into pi-dev
am:
7f4e9739e4
Change-Id: I78e08cc1e3a1ec52cc9bf813ab794c62a73da978
TreeHugger Robot [Fri, 22 Jun 2018 15:19:20 +0000 (15:19 +0000)]
Merge "Remove managed profile toast" into pi-dev
Jack Yu [Fri, 22 Jun 2018 03:39:13 +0000 (20:39 -0700)]
Merge "Removed dead code in DcTracker" am:
a0b9309ba2
am:
5ae46260e4
Change-Id: Ib664690a19a00c6739fd0bff87e343742832478e
Jack Yu [Fri, 22 Jun 2018 03:28:45 +0000 (20:28 -0700)]
Merge "Removed dead code in DcTracker"
am:
a0b9309ba2
Change-Id: I807835bcc1194f695e5fb30098cc82f50fef5d59
Treehugger Robot [Fri, 22 Jun 2018 00:21:43 +0000 (00:21 +0000)]
Merge "Removed dead code in DcTracker"
Neil Fuller [Thu, 21 Jun 2018 23:20:34 +0000 (16:20 -0700)]
[automerger skipped] Merge "Trim away some dead code" am:
d6a1657466 -s ours
am:
d85b36fde3 -s ours
Change-Id: I5b9006099a564fe8de1811e1254a3859ef3449d4
Neil Fuller [Thu, 21 Jun 2018 23:10:26 +0000 (16:10 -0700)]
[automerger skipped] Merge "Trim away some dead code"
am:
d6a1657466 -s ours
Change-Id: I7cb1845584c838fe6bcce743d9f3b9944da5d41b
Matthew Ng [Thu, 14 Jun 2018 22:16:55 +0000 (15:16 -0700)]
Allow quickscrub after deadzone consumes touch
Moved deadzone detection to QuickScrubController so that quick scrub can
still occur. If anything is consumed by deadzone, no other touches will
occur however quickscrub can be detected and function with launcher. No
other events except for touch down will be sent to launcher.
Test: scrub right above the home button
Change-Id: I4b4e7a8eacf8fe38d8644116a526c175adaba790
Fixes:
80536498
zhangkuili [Thu, 21 Jun 2018 22:04:48 +0000 (15:04 -0700)]
Merge "[Stability][hwui] check mmap return value" am:
b352dcd153
am:
399ac24bdf
Change-Id: I4075c1d652eb645e2f7ab05ecdb66fda4636423e
Evan Laird [Thu, 21 Jun 2018 21:56:57 +0000 (14:56 -0700)]
Merge "Add config to disallow the battery % option" into pi-dev
am:
a063da83f1
Change-Id: I4a0fe7c68bb8de5e55e83120ad323e5059b41149
Jack Yu [Thu, 21 Jun 2018 21:56:48 +0000 (14:56 -0700)]
Removed dead code in DcTracker
This work is part of IWLAN refactoring
Test: Build
Bug:
73659459
Change-Id: I041bdda1e168dde0bf5bff08c8c235986d2d8d7d
zhangkuili [Thu, 21 Jun 2018 21:53:15 +0000 (14:53 -0700)]
Merge "[Stability][hwui] check mmap return value"
am:
b352dcd153
Change-Id: I8d04c5433ca881e62a23e0aa13e022cdf8d16d9a
Julia Reynolds [Thu, 21 Jun 2018 21:51:21 +0000 (14:51 -0700)]
Merge "Catch unbinding errors" into oc-mr1-dev am:
ebd047e92f
am:
b2ad5f251c
Change-Id: Idf5835f2c43b560a6ac20a2723b1a86b76213a0a
TreeHugger Robot [Thu, 21 Jun 2018 21:18:36 +0000 (21:18 +0000)]
Merge "Add config to disallow the battery % option" into pi-dev
Julia Reynolds [Thu, 21 Jun 2018 21:15:26 +0000 (14:15 -0700)]
Merge "Catch unbinding errors" into oc-mr1-dev
am:
ebd047e92f
Change-Id: Ifd29c608bb23afb5ed630d9fc57d40f41b7d0921
TreeHugger Robot [Thu, 21 Jun 2018 21:00:27 +0000 (21:00 +0000)]
Merge "Catch unbinding errors" into oc-mr1-dev
Selim Cinek [Thu, 21 Jun 2018 20:55:41 +0000 (13:55 -0700)]
Merge "Only enable setAntiBurnInOffsetX() in AOD(Ambient) condition" into pi-dev
am:
43999195e9
Change-Id: I430343e75be34e70b8e4ff3c4f08b73c1ae7b103
Selim Cinek [Thu, 21 Jun 2018 20:40:56 +0000 (20:40 +0000)]
Merge "Only enable setAntiBurnInOffsetX() in AOD(Ambient) condition" into pi-dev
Treehugger Robot [Thu, 21 Jun 2018 20:15:31 +0000 (20:15 +0000)]
Merge "Trim away some dead code"
Treehugger Robot [Thu, 21 Jun 2018 20:13:36 +0000 (20:13 +0000)]
Merge "[Stability][hwui] check mmap return value"
Julia Reynolds [Thu, 21 Jun 2018 19:12:57 +0000 (12:12 -0700)]
Merge "Always ignore summaries" into pi-dev
am:
1fa5751789
Change-Id: Ic1a0d9c9bf50ea4c250bf4b5736a5da92abf0200
TreeHugger Robot [Thu, 21 Jun 2018 18:55:33 +0000 (18:55 +0000)]
Merge "Always ignore summaries" into pi-dev
Bill Yi [Thu, 21 Jun 2018 18:47:37 +0000 (11:47 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
cba5f92768 -s ours
Change-Id: I8acce36561def08ea6e6802d86c8b3ddbbe150ad
Bill Yi [Thu, 21 Jun 2018 18:46:05 +0000 (11:46 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
063ead3e1f -s ours
Change-Id: I18d7873ae8f9493eef4777ae36956ce012cf5692
TreeHugger Robot [Thu, 21 Jun 2018 18:35:27 +0000 (18:35 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Thu, 21 Jun 2018 18:33:40 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Thu, 21 Jun 2018 18:29:30 +0000 (11:29 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
ebfd27503a -s ours
Change-Id: Ib92fdf7cd9095f34a1ee581c1ed923d0e34994c9
Tyler Gunn [Thu, 21 Jun 2018 18:26:49 +0000 (11:26 -0700)]
Merge "Update docs and ensure PHONE_STATE is more predictable for unknown numbers." into pi-dev
am:
766259698a
Change-Id: Ic5051c6b01eddd001681d1addd0eeee2562c59ba
TreeHugger Robot [Thu, 21 Jun 2018 18:11:30 +0000 (18:11 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Tyler Gunn [Thu, 21 Jun 2018 18:10:16 +0000 (18:10 +0000)]
Merge "Update docs and ensure PHONE_STATE is more predictable for unknown numbers." into pi-dev
Julia Reynolds [Tue, 19 Jun 2018 19:12:42 +0000 (15:12 -0400)]
Remove managed profile toast
Change-Id: I9f324a94d7fab35b0f00a1bd9c675708dac6f85a
Fixes:
110418889
Test: atest SystemUITests
Bill Yi [Thu, 21 Jun 2018 16:42:26 +0000 (09:42 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ia75664c86821774661b830e2fc6ed8ef0392f58c
Jorim Jaggi [Thu, 21 Jun 2018 16:26:09 +0000 (09:26 -0700)]
Merge "Fix issue with manual touch dispatch" into pi-dev
am:
0fb45603fe
Change-Id: I977188732a3866fc84adf3e1ef1b6d65ee4ea410
TreeHugger Robot [Thu, 21 Jun 2018 16:10:35 +0000 (16:10 +0000)]
Merge "Fix issue with manual touch dispatch" into pi-dev
Julia Reynolds [Tue, 19 Jun 2018 19:39:23 +0000 (15:39 -0400)]
Always ignore summaries
Test: runtest systemui-notification
Bug:
78643290
Change-Id: Ia036e528666af336897431dd11efeffc92accdc7
(cherry picked from commit
760fa7613ef7ca7aee25c76a147cf29114268af2)
Neil Fuller [Fri, 24 Nov 2017 08:51:40 +0000 (08:51 +0000)]
Trim away some dead code
The time zone listening is currently unused so can
be removed. Also removed an unused constant and made a
constant final.
Bug:
63743683
Test: Build
Merged-In: I15870a025e9acac597edd914c9e59df415108586
Change-Id: I15870a025e9acac597edd914c9e59df415108586
Bill Yi [Thu, 21 Jun 2018 12:09:41 +0000 (05:09 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If0cc65463dca8363427a9021601aee4401caccaa
zhangkuili [Tue, 29 May 2018 02:23:29 +0000 (10:23 +0800)]
[Stability][hwui] check mmap return value
If mmap failed, it return -1 (MAP_FAILED)
Bug:
110507462
Test: manual
Change-Id: I3d0bac2e7c8b0bdc9cfb4ebb7b766d858876679d
Signed-off-by: zhangkuili <zhangkuili@xiaomi.com>
Bill Yi [Thu, 21 Jun 2018 07:55:32 +0000 (00:55 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I5e7887dbf5d42f3ff85a303356dc74c78c55b863
David Brazdil [Thu, 21 Jun 2018 06:15:50 +0000 (23:15 -0700)]
[automerger skipped] Merge "Stabilize hidden API lists" into pi-dev
am:
80167ec0c7 -s ours
Change-Id: I655be3bcd7d3f4fee796d08bdeb380d28f83e097
TreeHugger Robot [Thu, 21 Jun 2018 06:07:22 +0000 (06:07 +0000)]
Merge "Stabilize hidden API lists" into pi-dev
Nicolas Geoffray [Thu, 21 Jun 2018 05:33:07 +0000 (22:33 -0700)]
Merge "More light grey APIs." into pi-dev
am:
eec75058ba
Change-Id: I1d81f2c2aad1276690cbf5207b8b4ace2e4679c6
TreeHugger Robot [Thu, 21 Jun 2018 05:21:01 +0000 (05:21 +0000)]
Merge "More light grey APIs." into pi-dev
Chalard Jean [Thu, 21 Jun 2018 04:52:15 +0000 (21:52 -0700)]
Merge "Add StackedLinkProperties test case" am:
faf31f8638
am:
946957bc32
Change-Id: Idebb0fc4279a059bddecffc563bdf3ddf394002c
Dan Zhang [Thu, 21 Jun 2018 04:46:18 +0000 (21:46 -0700)]
Merge "Fix <UCP>[Power] toggled the power status" am:
b3eeb859f7
am:
26f781db62
Change-Id: Id37f64d7f63a0ca86353fdee18379309e4359810
Chalard Jean [Thu, 21 Jun 2018 04:23:17 +0000 (21:23 -0700)]
Merge "Add StackedLinkProperties test case"
am:
faf31f8638
Change-Id: I33d75bf593708317dca4ba6cec035b7f035cfa86
John Reck [Thu, 21 Jun 2018 04:21:16 +0000 (21:21 -0700)]
[automerger skipped] Merge "Fix PixelCopyTest failure in CTS" am:
b773556215 -s ours
am:
bd31702374 -s ours
Change-Id: Icf428422f68b5ee4ccaba207ed8eda20411918b9
Dan Zhang [Thu, 21 Jun 2018 04:18:07 +0000 (21:18 -0700)]
Merge "Fix <UCP>[Power] toggled the power status"
am:
b3eeb859f7
Change-Id: I7f56ece79f0eb10cc27d5c62d1c8300933b1c23b
John Reck [Thu, 21 Jun 2018 04:10:33 +0000 (21:10 -0700)]
[automerger skipped] Merge "Fix PixelCopyTest failure in CTS"
am:
b773556215 -s ours
Change-Id: I6d5d15e89dcf03c8002452018b1e8922890d2814
Chalard Jean [Thu, 21 Jun 2018 03:39:15 +0000 (03:39 +0000)]
Merge "Add StackedLinkProperties test case"
Dan Zhang [Thu, 21 Jun 2018 02:41:59 +0000 (02:41 +0000)]
Merge "Fix <UCP>[Power] toggled the power status"
John Reck [Thu, 21 Jun 2018 00:48:44 +0000 (00:48 +0000)]
Merge "Fix PixelCopyTest failure in CTS"
Romain Guy [Wed, 1 Nov 2017 16:50:28 +0000 (09:50 -0700)]
Fix PixelCopyTest failure in CTS
This feature needs support for renderable float textures, but the checks
were only guaranteeing support for float texture reads.
Bug:
68754504
Test: CtsViewTestCases
Change-Id: I0ce4a81cb8e09c10a5f1e65234685767a24ef8c4
Merged-In: I0ce4a81cb8e09c10a5f1e65234685767a24ef8c4
(cherry picked from commit
8472ac67fd1d815022874f5addace0c4334ae9f6)
(cherry picked from commit
8dc7f8275e5ba9004d219d7d7d990e91fc702095)
Marco Nelissen [Wed, 20 Jun 2018 22:28:32 +0000 (15:28 -0700)]
Merge "Fix race condition in MediaHTTPConnection" into pi-dev
am:
d7c87b74d9
Change-Id: I65de507c2b98b81a25141994baba38831aea9142
Marco Nelissen [Wed, 20 Jun 2018 22:14:33 +0000 (22:14 +0000)]
Merge "Fix race condition in MediaHTTPConnection" into pi-dev
Nicolas Geoffray [Wed, 13 Jun 2018 20:22:06 +0000 (21:22 +0100)]
More light grey APIs.
bug:
110157261
bug:
110065832
bug:
110179435
bug:
110174713
bug:
110191494
bug:
110282922
bug:
110289776
bug:
110314356
bug:
110340642
bug:
110382035
Bug:
110444248
Bug:
110447432
bug:
110378707
Test: m
Change-Id: I5d7c0f9d471eab22e23cc335f03cebecb642f871
Julia Reynolds [Wed, 20 Jun 2018 21:16:31 +0000 (14:16 -0700)]
Don't throw uri exceptions for user chosen sounds
am:
89945c5a22
Change-Id: I727de67d610818b4dc29a685446d0a1e7c975518
Brad Ebinger [Wed, 20 Jun 2018 18:48:48 +0000 (11:48 -0700)]
[automerger skipped] Merge "Clean up old Context references in ImsConfig" am:
a54d5e31e3 -s ours
am:
cacc29957a -s ours
Change-Id: I312b17cfe872dc4888ecb7b66d7430783123dd91
Brad Ebinger [Wed, 20 Jun 2018 17:45:28 +0000 (10:45 -0700)]
[automerger skipped] Merge "Clean up old Context references in ImsConfig"
am:
a54d5e31e3 -s ours
Change-Id: Iab246476747293816b72ef6755ce2c875638179f
Julia Reynolds [Wed, 13 Jun 2018 14:45:21 +0000 (10:45 -0400)]
Don't throw uri exceptions for user chosen sounds
Bug:
109889733
Test: runtest systemui-notification
Change-Id: I5ed599deca83f97899affce44e3ed8fbcacae366
(cherry picked from commit
218871ee3ffffea964658be327ffd06e1e3eed61)
Brad Ebinger [Wed, 20 Jun 2018 16:43:58 +0000 (16:43 +0000)]
Merge "Clean up old Context references in ImsConfig"
Beverly [Wed, 20 Jun 2018 15:51:48 +0000 (08:51 -0700)]
resolve merge conflicts
am:
1382d8d50e
Change-Id: I959a997d7ad57755421f90ee89cc2d7ba3cc7f0a
Tyler Gunn [Tue, 19 Jun 2018 16:55:43 +0000 (09:55 -0700)]
Update docs and ensure PHONE_STATE is more predictable for unknown numbers.
In P the PHONE_STATE broadcast behavior changed due to new permission
requirements. Updating the API docs for this broadcast to make it more
clear to developers how the broadcast will work given different permission
scenarios.
Also, made a minor change to how the "EXTRA_INCOMING_NUMBER" is populated
on the phone state broadcast. Originally we opted to remove
EXTRA_INCOMING_NUMBER when the number is empty. Developer feedback reveals
it is difficult to know for an unknown caller (where numer is empty)
whether the broadcast they're receiving is the one associated with the
broadcast for receivers with READ_CALL_LOG, or the one for receivers
without it. This minor change eliminates the need to count broadcasts and
instead allows the developer to just focus on whether the extra is present
or not.
Test: make docs and verify the javadoc appears as expected.
Test: Used test app to confirm functionality.
Bug:
110190165
Change-Id: I35967d53274b99d66b63f4ff5acb60a689745f9d
Marco Nelissen [Tue, 19 Jun 2018 19:38:23 +0000 (12:38 -0700)]
Fix race condition in MediaHTTPConnection
getSize() and getMIMEType() rely on seekTo() having completed.
If seekTo() was called on a different thread, for example because
NuCachedSource2 was doing reads on a background thread, getSize()
could return -1 if it was called after connection was established,
but before the response had been parsed.
Bug:
110230427
Test: manual
Change-Id: I469b47e025f1c7a7ef3123d3347668f0541e6f2d
Beverly [Wed, 20 Jun 2018 13:25:51 +0000 (09:25 -0400)]
resolve merge conflicts
resolve merge conflicts of
d9b0bdcbc41e9e57a2fea5424a580c52272852cd
to stage-aosp-master
Bug: none
Test: n/a
Change-Id: I97a0b4dd0736561e5575b1344f37a25847e4703e
OSDN Git Service
