OSDN Git Service

android-x86/frameworks-base.git
6 years agoRestore separate challenge state on error
Pavel Grafov [Mon, 25 Jun 2018 18:45:17 +0000 (11:45 -0700)]
Restore separate challenge state on error
am: f10ae7e731

Change-Id: I70957dae31bbe98f8286d9c96bccd002f0acdf01

6 years ago[automerger skipped] Merge "Prefer default Internet network for upstream tethering...
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

6 years agoMerge "Prefer default Internet network for upstream tethering."
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

6 years agoMerge "Prefer default Internet network for upstream tethering."
Treehugger Robot [Mon, 25 Jun 2018 12:08:46 +0000 (12:08 +0000)]
Merge "Prefer default Internet network for upstream tethering."

6 years agoRestore separate challenge state on error
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

6 years agoPrefer default Internet network for upstream tethering.
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)

6 years agoMerge "Conserve expansion after re-inflation" into pi-dev
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

6 years agoMerge "Conserve expansion after re-inflation" into pi-dev
TreeHugger Robot [Sat, 23 Jun 2018 08:05:06 +0000 (08:05 +0000)]
Merge "Conserve expansion after re-inflation" into pi-dev

6 years agoConserve expansion after re-inflation
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

6 years agoMerge "Camera: Update surface sharing format restrictions" into pi-dev
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

6 years agoMerge "Camera: Update surface sharing format restrictions" into pi-dev
TreeHugger Robot [Sat, 23 Jun 2018 00:11:04 +0000 (00:11 +0000)]
Merge "Camera: Update surface sharing format restrictions" into pi-dev

6 years agoMerge "docs: Edited UNINSTALL_SHORTCUT permission desc." into pi-dev
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

6 years agoMerge "docs: Edited UNINSTALL_SHORTCUT permission desc." into pi-dev
Kevin Hufnagle [Fri, 22 Jun 2018 21:58:38 +0000 (21:58 +0000)]
Merge "docs: Edited UNINSTALL_SHORTCUT permission desc." into pi-dev

6 years agoMerge "Allow quickscrub after deadzone consumes touch" 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

6 years agoMerge "Allow quickscrub after deadzone consumes touch" into pi-dev
TreeHugger Robot [Fri, 22 Jun 2018 19:24:08 +0000 (19:24 +0000)]
Merge "Allow quickscrub after deadzone consumes touch" into pi-dev

6 years agoMerge "Skip updating stack config if it is detached from a display" 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

6 years agoMerge "SettingsBackupAgent: notify of apBand conversion" into pi-dev
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

6 years agoMerge "Skip updating stack config if it is detached from a display" into pi-dev
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

6 years agoMerge "SettingsBackupAgent: notify of apBand conversion" 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

6 years agoMerge "Do not announce selected state for QS tiles." 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

6 years agoMerge "Do not announce selected state for QS tiles." into pi-dev
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

6 years agoMerge "Remove managed profile toast" 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

6 years agoMerge "Remove managed profile toast" into pi-dev
TreeHugger Robot [Fri, 22 Jun 2018 15:19:20 +0000 (15:19 +0000)]
Merge "Remove managed profile toast" into pi-dev

6 years agoMerge "Removed dead code in DcTracker" am: a0b9309ba2
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

6 years agoMerge "Removed dead code in DcTracker"
Jack Yu [Fri, 22 Jun 2018 03:28:45 +0000 (20:28 -0700)]
Merge "Removed dead code in DcTracker"
am: a0b9309ba2

Change-Id: I807835bcc1194f695e5fb30098cc82f50fef5d59

6 years agoMerge "Removed dead code in DcTracker"
Treehugger Robot [Fri, 22 Jun 2018 00:21:43 +0000 (00:21 +0000)]
Merge "Removed dead code in DcTracker"

6 years ago[automerger skipped] Merge "Trim away some dead code" am: d6a1657466 -s ours
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

6 years ago[automerger skipped] Merge "Trim away some dead code"
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

6 years agoAllow quickscrub after deadzone consumes touch
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

6 years agoMerge "[Stability][hwui] check mmap return value" am: b352dcd153
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

6 years agoMerge "Add config to disallow the battery % option" into pi-dev
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

6 years agoRemoved dead code in DcTracker
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

6 years agoMerge "[Stability][hwui] check mmap return value"
zhangkuili [Thu, 21 Jun 2018 21:53:15 +0000 (14:53 -0700)]
Merge "[Stability][hwui] check mmap return value"
am: b352dcd153

Change-Id: I8d04c5433ca881e62a23e0aa13e022cdf8d16d9a

6 years agoMerge "Catch unbinding errors" into oc-mr1-dev am: ebd047e92f
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

6 years agoMerge "Add config to disallow the battery % option" into pi-dev
TreeHugger Robot [Thu, 21 Jun 2018 21:18:36 +0000 (21:18 +0000)]
Merge "Add config to disallow the battery % option" into pi-dev

6 years agoMerge "Catch unbinding errors" into oc-mr1-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

6 years agoMerge "Catch unbinding errors" into oc-mr1-dev
TreeHugger Robot [Thu, 21 Jun 2018 21:00:27 +0000 (21:00 +0000)]
Merge "Catch unbinding errors" into oc-mr1-dev

6 years agoMerge "Only enable setAntiBurnInOffsetX() in AOD(Ambient) condition" into pi-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

6 years agoMerge "Only enable setAntiBurnInOffsetX() in AOD(Ambient) condition" into pi-dev
Selim Cinek [Thu, 21 Jun 2018 20:40:56 +0000 (20:40 +0000)]
Merge "Only enable setAntiBurnInOffsetX() in AOD(Ambient) condition" into pi-dev

6 years agoMerge "Trim away some dead code"
Treehugger Robot [Thu, 21 Jun 2018 20:15:31 +0000 (20:15 +0000)]
Merge "Trim away some dead code"

6 years agoMerge "[Stability][hwui] check mmap return value"
Treehugger Robot [Thu, 21 Jun 2018 20:13:36 +0000 (20:13 +0000)]
Merge "[Stability][hwui] check mmap return value"

6 years agoMerge "Always ignore summaries" into pi-dev
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

6 years agoMerge "Always ignore summaries" into pi-dev
TreeHugger Robot [Thu, 21 Jun 2018 18:55:33 +0000 (18:55 +0000)]
Merge "Always ignore summaries" into pi-dev

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" 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

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Thu, 21 Jun 2018 18:35:27 +0000 (18:35 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "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

6 years ago[automerger skipped] 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

6 years agoMerge "Update docs and ensure PHONE_STATE is more predictable for unknown numbers...
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

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Thu, 21 Jun 2018 18:11:30 +0000 (18:11 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Update docs and ensure PHONE_STATE is more predictable for unknown numbers...
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

6 years agoRemove managed profile toast
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoMerge "Fix issue with manual touch dispatch" into pi-dev
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

6 years agoMerge "Fix issue with manual touch dispatch" into pi-dev
TreeHugger Robot [Thu, 21 Jun 2018 16:10:35 +0000 (16:10 +0000)]
Merge "Fix issue with manual touch dispatch" into pi-dev

6 years agoAlways ignore summaries
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)

6 years agoTrim away some dead code
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

6 years agoImport translations. DO NOT MERGE
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

6 years ago[Stability][hwui] check mmap return value
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>
6 years agoImport translations. DO NOT MERGE
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

6 years ago[automerger skipped] Merge "Stabilize hidden API lists" into pi-dev
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

6 years agoMerge "Stabilize hidden API lists" into pi-dev
TreeHugger Robot [Thu, 21 Jun 2018 06:07:22 +0000 (06:07 +0000)]
Merge "Stabilize hidden API lists" into pi-dev

6 years agoMerge "More light grey APIs." 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

6 years agoMerge "More light grey APIs." into pi-dev
TreeHugger Robot [Thu, 21 Jun 2018 05:21:01 +0000 (05:21 +0000)]
Merge "More light grey APIs." into pi-dev

6 years agoMerge "Add StackedLinkProperties test case" am: faf31f8638
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

6 years agoMerge "Fix <UCP>[Power] toggled the power status" am: b3eeb859f7
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

6 years agoMerge "Add StackedLinkProperties test case"
Chalard Jean [Thu, 21 Jun 2018 04:23:17 +0000 (21:23 -0700)]
Merge "Add StackedLinkProperties test case"
am: faf31f8638

Change-Id: I33d75bf593708317dca4ba6cec035b7f035cfa86

6 years ago[automerger skipped] Merge "Fix PixelCopyTest failure in CTS" am: b773556215 -s...
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

6 years agoMerge "Fix <UCP>[Power] toggled the power status"
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

6 years ago[automerger skipped] Merge "Fix PixelCopyTest failure in CTS"
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

6 years agoMerge "Add StackedLinkProperties test case"
Chalard Jean [Thu, 21 Jun 2018 03:39:15 +0000 (03:39 +0000)]
Merge "Add StackedLinkProperties test case"

6 years agoMerge "Fix <UCP>[Power] toggled the power status"
Dan Zhang [Thu, 21 Jun 2018 02:41:59 +0000 (02:41 +0000)]
Merge "Fix <UCP>[Power] toggled the power status"

6 years agoMerge "Fix PixelCopyTest failure in CTS"
John Reck [Thu, 21 Jun 2018 00:48:44 +0000 (00:48 +0000)]
Merge "Fix PixelCopyTest failure in CTS"

6 years agoFix 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)

6 years agoMerge "Fix race condition in MediaHTTPConnection" into pi-dev
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

6 years agoMerge "Fix race condition in MediaHTTPConnection" into pi-dev
Marco Nelissen [Wed, 20 Jun 2018 22:14:33 +0000 (22:14 +0000)]
Merge "Fix race condition in MediaHTTPConnection" into pi-dev

6 years agoMore light grey APIs.
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

6 years agoDon't throw uri exceptions for user chosen sounds
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

6 years ago[automerger skipped] Merge "Clean up old Context references in ImsConfig" am: a54d5e3...
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

6 years ago[automerger skipped] Merge "Clean up old Context references in ImsConfig"
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

6 years agoDon't throw uri exceptions for user chosen sounds
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)

6 years agoMerge "Clean up old Context references in ImsConfig"
Brad Ebinger [Wed, 20 Jun 2018 16:43:58 +0000 (16:43 +0000)]
Merge "Clean up old Context references in ImsConfig"

6 years agoresolve merge conflicts
Beverly [Wed, 20 Jun 2018 15:51:48 +0000 (08:51 -0700)]
resolve merge conflicts
am: 1382d8d50e

Change-Id: I959a997d7ad57755421f90ee89cc2d7ba3cc7f0a

6 years agoUpdate docs and ensure PHONE_STATE is more predictable for unknown numbers.
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

6 years agoFix race condition in MediaHTTPConnection
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

6 years agoresolve merge conflicts
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

6 years agoFix issue with manual touch dispatch
Jorim Jaggi [Tue, 19 Jun 2018 15:27:08 +0000 (17:27 +0200)]
Fix issue with manual touch dispatch

Need to dispatch it to the view that guards against the disabled
flags.

Change-Id: I0082ef24ed6aa06631f475cc33a0cf3f5f138911
Merged-In: I0082ef24ed6aa06631f475cc33a0cf3f5f138911
Fixes: 110228458
Test: Expand above notch from SUW

6 years agoMerge "Clean up RemoteCallbackList when we're done with it." into pi-dev
Martijn Coenen [Wed, 20 Jun 2018 08:55:02 +0000 (01:55 -0700)]
Merge "Clean up RemoteCallbackList when we're done with it." into pi-dev
am: bbe6ee065d

Change-Id: Ic7bd40f2a1fe95eae275dbd0580d7acd283ffca7

6 years agoMerge "Prefer default Internet network for upstream tethering." into pi-dev
Erik Kline [Wed, 20 Jun 2018 08:14:14 +0000 (01:14 -0700)]
Merge "Prefer default Internet network for upstream tethering." into pi-dev
am: 1e1635a45e

Change-Id: I9cddf1fb7aa3b8d56bf048c563556244e74808c2

6 years agoMerge "Clean up RemoteCallbackList when we're done with it." into pi-dev
TreeHugger Robot [Wed, 20 Jun 2018 07:47:35 +0000 (07:47 +0000)]
Merge "Clean up RemoteCallbackList when we're done with it." into pi-dev

6 years agoMerge "Prefer default Internet network for upstream tethering." into pi-dev
TreeHugger Robot [Wed, 20 Jun 2018 04:28:50 +0000 (04:28 +0000)]
Merge "Prefer default Internet network for upstream tethering." into pi-dev

6 years agoOnly enable setAntiBurnInOffsetX() in AOD(Ambient) condition
Bill Lin [Wed, 13 Jun 2018 10:07:15 +0000 (18:07 +0800)]
Only enable setAntiBurnInOffsetX() in AOD(Ambient) condition

NotificationPanelView detect the ACTION_DOWN X-position for expanding Panel
and dispatch x-offset to QSFrame and StackScroller
However, StackScroller reset the translateX via updateAntiBurnInTranslation()
Base on previous patches to enhance setAntiBurnInOffsetX policy
     1. ag/3536525 (Fixes: 72527703)
     2. ag/3846247 (Fixes: 77541088)

Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayoutTest.java
Change-Id: I52c86e865d97282e40b6f2847a2ff0190e4d80e9
Fix: 110102296

6 years agoMerge "Revert isResolvingImsBinding ITelephony interface" into pi-dev
Brad Ebinger [Tue, 19 Jun 2018 23:13:53 +0000 (16:13 -0700)]
Merge "Revert isResolvingImsBinding ITelephony interface" into pi-dev
am: 4cc443ae2e

Change-Id: I9c8cc1c4401590865f33fa13402152287063cecf

6 years agoMerge "Revert isResolvingImsBinding ITelephony interface" into pi-dev
Brad Ebinger [Tue, 19 Jun 2018 22:36:52 +0000 (22:36 +0000)]
Merge "Revert isResolvingImsBinding ITelephony interface" into pi-dev

6 years agoMerge "Allow apps to queue multiple toast messages."
Treehugger Robot [Tue, 19 Jun 2018 22:20:24 +0000 (22:20 +0000)]
Merge "Allow apps to queue multiple toast messages."

6 years agoMerge "Enable REQUEST_LOCATION from GNSS HAL" into pi-dev
Yu-Han Yang [Tue, 19 Jun 2018 21:26:35 +0000 (14:26 -0700)]
Merge "Enable REQUEST_LOCATION from GNSS HAL" into pi-dev
am: 6eb9ce63b8

Change-Id: Ie75c6c150450afd21a88736ec9d29d7dd17fdb87

6 years agoMerge "Enable REQUEST_LOCATION from GNSS HAL" into pi-dev
Yu-Han Yang [Tue, 19 Jun 2018 21:08:48 +0000 (21:08 +0000)]
Merge "Enable REQUEST_LOCATION from GNSS HAL" into pi-dev

6 years agoMerge "Camera: codegen doc update" into pi-dev
Shuzhen Wang [Tue, 19 Jun 2018 20:36:06 +0000 (13:36 -0700)]
Merge "Camera: codegen doc update" into pi-dev
am: 941189bf28

Change-Id: Ic66b738d058eb25d015365e933086c0a6d820511

6 years agoMerge "Don't override targetVers with minCode" am: 3b0eba4499
Colin Cross [Tue, 19 Jun 2018 20:20:48 +0000 (13:20 -0700)]
Merge "Don't override targetVers with minCode" am: 3b0eba4499
am: 234a906ee1

Change-Id: Ie0eaed7be80819484a41bca5a0bd396138f5870f

6 years agoMerge "Camera: codegen doc update" into pi-dev
Shuzhen Wang [Tue, 19 Jun 2018 20:19:38 +0000 (20:19 +0000)]
Merge "Camera: codegen doc update" into pi-dev