OSDN Git Service
bsears [Sun, 10 Jun 2018 06:03:35 +0000 (23:03 -0700)]
Merge "Include "emergency calls only" in disabled SIM strings." into pi-dev
am:
9b1f560ee5
Change-Id: I00c1560589e67279a007d182b1a7c0aba9be2f79
bsears [Sun, 10 Jun 2018 05:50:30 +0000 (05:50 +0000)]
Merge "Include "emergency calls only" in disabled SIM strings." into pi-dev
Nathan Harold [Sat, 9 Jun 2018 16:25:32 +0000 (09:25 -0700)]
Merge "Disable the AppOp Restriction for IpSec Tunnels" into stage-aosp-master
am:
bda7c96038
Change-Id: I98f2a964b3035daf93b54dc2b72561b16d2ded92
Beverly [Sat, 9 Jun 2018 16:18:14 +0000 (09:18 -0700)]
Merge changes from topic "audio-package-update" am:
2d5156733c
am:
cad356a9d0
Change-Id: I5ddb28a330b0c43966c068ef8f2db96761c3b70c
Jerry Zhang [Sat, 9 Jun 2018 16:09:50 +0000 (09:09 -0700)]
Merge "Check for null path in getInternalPathForUser" am:
0559afdbcc
am:
c2861c5698
Change-Id: I2159b0ebe93cab917f27597ffeb446f4f49347dd
Xin Li [Sat, 9 Jun 2018 09:21:17 +0000 (02:21 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am:
401c4b1d00
Change-Id: If4ace9b12ba9049e9f333aafbdb51610c4f98353
Xin Li [Sat, 9 Jun 2018 09:18:01 +0000 (02:18 -0700)]
Skip
ef9f2740a7 in proposed pi-dev-plus-aosp-without-vendor merge.
am:
f700e7feaa
Change-Id: I1a6504799a83d2736881b149a5181e78bc212193
TreeHugger Robot [Sat, 9 Jun 2018 02:06:38 +0000 (02:06 +0000)]
Merge "Disable the AppOp Restriction for IpSec Tunnels" into stage-aosp-master
Fredrik Roubert [Sat, 9 Jun 2018 01:36:33 +0000 (18:36 -0700)]
Merge "API updated for ICU4J 61.1" am:
c2791389a5
am:
18d7cd7106
Change-Id: I501f6f8c5654777241c02c02a4cbb5e939c60cf1
nharold [Sat, 9 Jun 2018 01:31:25 +0000 (18:31 -0700)]
[automerger skipped] Merge changes from topic "ipsec-sync-with-pi" am:
b2749539c0
am:
ef9f2740a7 -s ours
Change-Id: Ib18c4a534b8b1f611d0d5b02897afe73055fed6e
Beverly [Sat, 9 Jun 2018 00:11:41 +0000 (17:11 -0700)]
Merge changes from topic "audio-package-update"
am:
2d5156733c
Change-Id: I051fc7af9663a90ff5b7e080dd44001646d35089
Jerry Zhang [Fri, 8 Jun 2018 23:55:43 +0000 (16:55 -0700)]
Merge "Check for null path in getInternalPathForUser"
am:
0559afdbcc
Change-Id: I0669f429a389655e04f26ab4cd19fbf69f3dbef1
Eugene Susla [Fri, 8 Jun 2018 23:54:41 +0000 (16:54 -0700)]
Merge "Revert "Fix DefaultPermissionGrantPolicyTest"" into pi-dev
am:
e0f55c35a5
Change-Id: Ie3f14693a2520a3e6760ec0f798ae6a7a00b8d8a
TreeHugger Robot [Fri, 8 Jun 2018 23:45:29 +0000 (23:45 +0000)]
Merge "Revert "Fix DefaultPermissionGrantPolicyTest"" into pi-dev
Nan Zhang [Fri, 8 Jun 2018 23:33:39 +0000 (16:33 -0700)]
Merge "Revert "Added online-sdk & off-sdk for Metalava"" into pi-dev
am:
a13de3dac2
Change-Id: If5c09ea9b692ad418372783d903e48bd36eeac73
Nan Zhang [Fri, 8 Jun 2018 23:26:16 +0000 (23:26 +0000)]
Merge "Revert "Added online-sdk & off-sdk for Metalava"" into pi-dev
Nathan Harold [Wed, 16 May 2018 02:18:38 +0000 (19:18 -0700)]
Disable the AppOp Restriction for IpSec Tunnels
This CL temporarily removes the AppOp restriction
that disallows creation of IpSec tunnels due to
the lack of the appropriate AppOp in AOSP/master.
When the relevant framework merges out to master,
this CL should be reverted.
Manually merging this due to skipping a merge
conflict at
ef9f2740a790feceaa47a24b1a179e93c4ffb5e6
Bug: none
Test: compilation
Change-Id: Ic06c193f85f6bcdd0ead4238825c1add78703cde
Nan Zhang [Fri, 8 Jun 2018 23:11:18 +0000 (23:11 +0000)]
Revert "Added online-sdk & off-sdk for Metalava"
This reverts commit
726df7efc9e8faad94ee8133fcb4fd976b66ebda.
Reason for revert: <Didn't add Merged-in which flows this change down to pi-dev-plus-aosp>
Bug: b/
78245848
Change-Id: Ie15181bcb91314718ee9902402179cd010f17553
Selim Cinek [Fri, 8 Jun 2018 23:07:23 +0000 (16:07 -0700)]
Merge "Revert "Consider icon scale when calculating icon offset in shelf"" into pi-dev
am:
70a9cd292b
Change-Id: If6d1ec275a8734c1f4c891598aa4c6265cda7ae3
Selim Cinek [Fri, 8 Jun 2018 23:00:57 +0000 (16:00 -0700)]
Merge "Fixed a flickering of the icon when it goes into the shelf" into pi-dev
am:
40e41a6299
Change-Id: I37585d06d53e6213f163a38592605c855b551539
Selim Cinek [Fri, 8 Jun 2018 22:51:07 +0000 (22:51 +0000)]
Merge "Revert "Consider icon scale when calculating icon offset in shelf"" into pi-dev
Selim Cinek [Fri, 8 Jun 2018 22:50:12 +0000 (22:50 +0000)]
Merge "Fixed a flickering of the icon when it goes into the shelf" into pi-dev
Eugene Susla [Fri, 8 Jun 2018 21:39:58 +0000 (21:39 +0000)]
Revert "Fix DefaultPermissionGrantPolicyTest"
This ended up being not the right fix for the bug, and
had a consequence of AiAi permissions becoming fixed.
Per recent email thread, reverting this back to how it was
This reverts commit
0988f24dfff1529552c857fb1c28592070ecc1b8.
Fixes:
109665265
Change-Id: Ibf39c3b788c09f189d941f830ebbe8f371fc6f6a
Nicolas Geoffray [Fri, 8 Jun 2018 21:41:46 +0000 (14:41 -0700)]
Merge "More light grey APIs." into pi-dev
am:
ce30fd3904
Change-Id: Id1f03630abdbaa4106405992f31f2e8bc072fe49
Xin Li [Fri, 8 Jun 2018 21:36:39 +0000 (14:36 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug:
79597307
Change-Id: I2ec319e9fc92e959580a4a3cfe955ae91996dc96
Xin Li [Fri, 8 Jun 2018 21:36:00 +0000 (14:36 -0700)]
Skip
ef9f2740a7 in proposed pi-dev-plus-aosp-without-vendor merge.
Bug:
79597307
Change-Id: I8ac04fdd94b069434e2f00b0bfab63eb916f6129
TreeHugger Robot [Fri, 8 Jun 2018 21:21:29 +0000 (21:21 +0000)]
Merge "More light grey APIs." into pi-dev
Nan Zhang [Fri, 8 Jun 2018 21:07:24 +0000 (14:07 -0700)]
Added online-sdk & off-sdk for Metalava
am:
726df7efc9
Change-Id: Ic75bef64089317a2407bf1c6206744863ff7ae37
Treehugger Robot [Fri, 8 Jun 2018 20:47:03 +0000 (20:47 +0000)]
Merge changes from topic "audio-package-update"
* changes:
Include InCallNotification.ogg in AllAudio.mk file
Add ChargingStarted + InCallNotif to AudioPackage
Treehugger Robot [Fri, 8 Jun 2018 20:16:14 +0000 (20:16 +0000)]
Merge "Check for null path in getInternalPathForUser"
Brad Ebinger [Fri, 8 Jun 2018 19:45:30 +0000 (12:45 -0700)]
[automerger skipped] Merge "Adds a private field to parceled data." am:
7db23752ab
am:
1ff8f364d4 -s ours
Change-Id: Ia4112ec02579389e4fa02fabe7de493ee087124b
Brad Ebinger [Fri, 8 Jun 2018 19:38:09 +0000 (12:38 -0700)]
[automerger skipped] Merge "Unhide @SystemApi Constructor" am:
442b546e2a
am:
a56e388a75 -s ours
Change-Id: I3e60e7c533b78096800d5077c810483da747f1e6
Fredrik Roubert [Fri, 8 Jun 2018 19:38:06 +0000 (12:38 -0700)]
Merge "API updated for ICU4J 61.1"
am:
c2791389a5
Change-Id: I15f620499d0cc69dae06e6d986f8e2d9bcde26a6
Dan Sandler [Fri, 8 Jun 2018 19:34:52 +0000 (15:34 -0400)]
Include "emergency calls only" in disabled SIM strings.
This message appears in the QS footer when the SIM has been
disabled permanently (IccCardConstants.State.PERM_DISABLED).
Required in Australia, harmless elsewhere.
Test: runtest systemui
Bug:
109874640
Change-Id: Ib2b3fcf2bd84c54b61f0bd45fe0b83209d9c9bd0
nharold [Fri, 8 Jun 2018 19:34:09 +0000 (12:34 -0700)]
Merge changes from topic "ipsec-sync-with-pi"
am:
b2749539c0
Change-Id: Ic91ed8f496163c560c6f1fd306bc74e5fecb61c2
Brad Ebinger [Fri, 8 Jun 2018 19:27:22 +0000 (12:27 -0700)]
Merge "Adds a private field to parceled data."
am:
7db23752ab
Change-Id: I9d0bde31a8aeb67b62e202b3b8946b066b81d186
Brad Ebinger [Fri, 8 Jun 2018 19:21:11 +0000 (12:21 -0700)]
Merge "Unhide @SystemApi Constructor"
am:
442b546e2a
Change-Id: Ie6281283f6605b7125882698333644843838e2ef
Nan Zhang [Fri, 8 Jun 2018 18:50:42 +0000 (11:50 -0700)]
Added online-sdk & off-sdk for Metalava
Test: m -j metalava online-sdk-docs
Bug: b/
78245848
Change-Id: I2cf92b14d20ecb2898e90c5e5956612f49acd33c
Jerry Zhang [Wed, 6 Jun 2018 18:04:46 +0000 (11:04 -0700)]
Check for null path in getInternalPathForUser
In some situations, path could be null resulting
in a crash.
Test: no crash
Bug:
109730998
Change-Id: I2ce0410162d1327905d690331f461f9187e20906
(cherry picked from commit
6f6154bf0493cf66628c8f2418827fe54679b1eb)
Nan Zhang [Fri, 8 Jun 2018 17:38:34 +0000 (10:38 -0700)]
[automerger skipped] Merge "Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs" into pi-dev
am:
cb3dd2889c -s ours
Change-Id: I667ac3fca83f1a4d8633903d877e7fe52765b6fd
Felipe Leme [Fri, 8 Jun 2018 17:32:02 +0000 (10:32 -0700)]
Merge "Fixed typo on TextValueSanitizer sample." into pi-dev
am:
c5b828df68
Change-Id: I54479da23ba82cccc4edd8eac1b3b27bc7942b93
Nan Zhang [Fri, 8 Jun 2018 17:28:37 +0000 (17:28 +0000)]
Merge "Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs" into pi-dev
TreeHugger Robot [Fri, 8 Jun 2018 17:20:27 +0000 (17:20 +0000)]
Merge "Fixed typo on TextValueSanitizer sample." into pi-dev
Treehugger Robot [Fri, 8 Jun 2018 17:19:55 +0000 (17:19 +0000)]
Merge "API updated for ICU4J 61.1"
nharold [Fri, 8 Jun 2018 17:07:11 +0000 (17:07 +0000)]
Merge changes from topic "ipsec-sync-with-pi"
* changes:
Disable the AppOp Restriction for IpSec Tunnels
Rework Exception Handling for IpSecManager
Update IpSecManager to use InetAddress and prefixLen
Add AppOps Checks for MANAGE_IPSEC_TUNNELS
Add MANAGE_IPSEC_TUNNELS Permission
Brad Ebinger [Fri, 8 Jun 2018 17:03:14 +0000 (17:03 +0000)]
Merge "Adds a private field to parceled data."
Brad Ebinger [Fri, 8 Jun 2018 17:02:48 +0000 (17:02 +0000)]
Merge "Unhide @SystemApi Constructor"
David Brazdil [Fri, 8 Jun 2018 16:20:59 +0000 (09:20 -0700)]
Merge "Build dark greylist from public + light grey API" am:
60229832de
am:
bd0dd0e59f
Change-Id: Icf43773b041d8058cd79da2b3f085f33f19f2078
David Brazdil [Fri, 8 Jun 2018 16:10:52 +0000 (09:10 -0700)]
Merge "Build dark greylist from public + light grey API"
am:
60229832de
Change-Id: I7a0077ed63f17e4a60482fad3f39ee1ab2d89461
Selim Cinek [Fri, 8 Jun 2018 07:26:48 +0000 (00:26 -0700)]
Fixed a flickering of the icon when it goes into the shelf
We can adjust the Pivot such that the scaling doesn't happen
irregularly and that the animation is smooth.
Change-Id: Ib2e42a20430e1c10950a197a4c04e7c64c7dec67
Test: add notification, no flicker
Fixes:
80270979
David Brazdil [Fri, 8 Jun 2018 14:22:26 +0000 (14:22 +0000)]
Merge "Build dark greylist from public + light grey API"
Fredrik Roubert [Tue, 3 Apr 2018 18:55:14 +0000 (20:55 +0200)]
API updated for ICU4J 61.1
Bug:
77634530
Bug:
109837373
Test: make
Test: cts-tradefed run cts-dev -m CtsIcuTestCases -t android.icu.dev.test.format.MeasureUnitTest
for CTS coverage
Change-Id: I721fbef5c79df1310e144a48ab2f18929b10bdfa
Chalard Jean [Fri, 8 Jun 2018 13:08:56 +0000 (06:08 -0700)]
Merge "Opportunistic typo fix" am:
6b03498a54
am:
99cf81acac
Change-Id: Ie1909cb93fa6ed28e8d43a6a3849f5b4d8eec861
Chalard Jean [Fri, 8 Jun 2018 13:01:27 +0000 (06:01 -0700)]
Merge "Opportunistic typo fix"
am:
6b03498a54
Change-Id: Id6dc12172a9fb1980a598ba070af1b10b1738849
Nicolas Geoffray [Fri, 8 Jun 2018 12:09:18 +0000 (13:09 +0100)]
More light grey APIs.
bug:
109894533
bug:
109889637
Test: m
Change-Id: I3bf3f5b846a48fe189131fb0f6a3be217c274554
Bill Lin [Fri, 8 Jun 2018 09:07:13 +0000 (17:07 +0800)]
Revert "Consider icon scale when calculating icon offset in shelf"
This reverts commit
5dad60e6928f29d5a959cb4e2fb45e17253ca88c.
The patch may cause latest Notification do not align center
Bug:
109868942
Test: atest & manual use notify observe only last 1 notification visual
Change-Id: I81e5de4d0a2822c96ce9a815519bb0413f26f27c
Treehugger Robot [Fri, 8 Jun 2018 11:51:29 +0000 (11:51 +0000)]
Merge "Opportunistic typo fix"
Chris Forbes [Fri, 8 Jun 2018 05:23:29 +0000 (22:23 -0700)]
Merge "pm: Exposing Vulkan 1.1 does not guarantee AHB extension support" into pi-dev
am:
551328eaaa
Change-Id: I4f9a420dcefb53e767a745f595787b71fcacd228
Chris Forbes [Fri, 8 Jun 2018 05:14:12 +0000 (05:14 +0000)]
Merge "pm: Exposing Vulkan 1.1 does not guarantee AHB extension support" into pi-dev
Svet Ganov [Fri, 8 Jun 2018 05:12:45 +0000 (22:12 -0700)]
Merge "Don't access keyguard from instant apps." into pi-dev
am:
e7bd4e7e8f
Change-Id: I5d5d8ea0c7b5756143b5140e4cf16ae584147345
TreeHugger Robot [Fri, 8 Jun 2018 04:49:39 +0000 (04:49 +0000)]
Merge "Don't access keyguard from instant apps." into pi-dev
Eric Laurent [Fri, 8 Jun 2018 04:43:53 +0000 (21:43 -0700)]
[automerger skipped] Merge "Add field to set A2DP device volume on connect (1/2)" am:
1b9de57f38
am:
fe96bd9c72 -s ours
Change-Id: Ife1a1762bba30d0a24919498c8b5c06b5639ac92
Android Build Merger (Role) [Fri, 8 Jun 2018 04:19:01 +0000 (04:19 +0000)]
Merge "Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev am:
eaf3590eda" into pi-dev-plus-aosp
Adam Powell [Fri, 8 Jun 2018 04:18:10 +0000 (21:18 -0700)]
Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev
am:
eaf3590eda
Change-Id: I569a2caf105c4b6cf60b81026567ef4af7ca31c9
Android Build Merger (Role) [Fri, 8 Jun 2018 04:15:24 +0000 (04:15 +0000)]
Merge "Merge "Add filter for NoPreloadHolders" am:
88ee5c93bb am:
202e61f127" into pi-dev-plus-aosp
Mathieu Chartier [Fri, 8 Jun 2018 04:14:59 +0000 (21:14 -0700)]
Merge "Add filter for NoPreloadHolders" am:
88ee5c93bb
am:
202e61f127
Change-Id: Id4967cc4eb918ef81be118d6c03707b4e4e1983e
Lucas Dupin [Fri, 8 Jun 2018 04:10:12 +0000 (21:10 -0700)]
Merge "Animate owner info during wake-up transition" into pi-dev
am:
c28e772042
Change-Id: I24a01e8e9ea9d82275a7434fc8dfdc5d1f4a30ad
TreeHugger Robot [Fri, 8 Jun 2018 03:48:21 +0000 (03:48 +0000)]
Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev
TreeHugger Robot [Fri, 8 Jun 2018 03:38:01 +0000 (03:38 +0000)]
Merge "Animate owner info during wake-up transition" into pi-dev
Svet Ganov [Fri, 8 Jun 2018 03:20:34 +0000 (20:20 -0700)]
Don't access keyguard from instant apps.
Test: cts-instant-tradefed run cts-instant -m CtsViewTestCases
bug:
109652548
Change-Id: I6f8bb714bd98fd53068b2662633a9155d64b274c
Svetoslav Ganov [Fri, 8 Jun 2018 03:15:54 +0000 (20:15 -0700)]
Merge "Revert "Allow instant apps to send broadcasts to themselves"" into pi-dev
am:
97995da6e1
Change-Id: I014e8de99a78a489f1f32738429d1cb0cebc4076
Eric Laurent [Fri, 8 Jun 2018 03:10:14 +0000 (20:10 -0700)]
Merge "Add field to set A2DP device volume on connect (1/2)"
am:
1b9de57f38
Change-Id: I128bf69bfdd9efaaf186ed3b9278d7ef1479b19e
TreeHugger Robot [Fri, 8 Jun 2018 03:00:26 +0000 (03:00 +0000)]
Merge "Revert "Allow instant apps to send broadcasts to themselves"" into pi-dev
Benjamin Miller [Fri, 8 Jun 2018 02:32:53 +0000 (19:32 -0700)]
Merge "Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS." into pi-dev
am:
0f5f09844d
Change-Id: I6c19f03debc6d15eece445dfd7fb0f5336d90407
Mathieu Chartier [Fri, 8 Jun 2018 02:32:39 +0000 (19:32 -0700)]
Merge "Add filter for NoPreloadHolders"
am:
88ee5c93bb
Change-Id: I4e6b539a4fabf1584673100e48146f22a929f3b3
TreeHugger Robot [Fri, 8 Jun 2018 02:24:22 +0000 (02:24 +0000)]
Merge "Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS." into pi-dev
Lin Guo [Fri, 8 Jun 2018 02:12:25 +0000 (19:12 -0700)]
Merge changes from topic "volume-change-flags" into pi-dev
am:
a88cf78009
Change-Id: Idbcaa08b7255c8d2dfd7d2bae42fe1daf3c12bf8
Treehugger Robot [Fri, 8 Jun 2018 02:06:17 +0000 (02:06 +0000)]
Merge "Add field to set A2DP device volume on connect (1/2)"
TreeHugger Robot [Fri, 8 Jun 2018 01:58:10 +0000 (01:58 +0000)]
Merge changes from topic "volume-change-flags" into pi-dev
* changes:
Only show the volume dialog if the AudioManager.FLAG_SHOW_UI bit is set
Comply with the volume callback change
Nathan Harold [Wed, 16 May 2018 02:18:38 +0000 (19:18 -0700)]
Disable the AppOp Restriction for IpSec Tunnels
This CL temporarily removes the AppOp restriction
that disallows creation of IpSec tunnels due to
the lack of the appropriate AppOp in AOSP/master.
When the relevant framework merges out to master,
this CL should be reverted.
Bug: none
Test: compilation
Change-Id: Ic06c193f85f6bcdd0ead4238825c1add78703cde
Nathan Harold [Tue, 3 Apr 2018 23:13:19 +0000 (16:13 -0700)]
Rework Exception Handling for IpSecManager
In order to properly support EOPNOTSUPP this CL
applies a consistent approach to handling Exceptions.
Hereafter, all exceptions that aren't of a special
method-specific type (such as SpiUnavailableException)
will all be returned to the calling process unchanged.
At the API call site, the ServiceSpecificException,
which is really an Errno, will be inspected and either
converted to an unchecked exception for types we know,
or it will be converted to an IOException in cases where
that method can return a checked exception. In cases
where we do not expect an errno, we will simply throw
a generic RuntimeException. This means all API calls
will now properly throw UnsupportedOperationException
and may be CTS tested accordingly.
Bug:
72420898
Test: runtest frameworks-net
Merged-In: I4a00e221618896223fcdb4b4279fb14cd14e34d8
Change-Id: I4a00e221618896223fcdb4b4279fb14cd14e34d8
(cherry picked from commit
ddeb90aa9db108d4a2e5aadc778a726b65e5c921)
Benedict Wong [Wed, 4 Apr 2018 03:30:54 +0000 (20:30 -0700)]
Update IpSecManager to use InetAddress and prefixLen
LinkAddress constructors are currently @hide; this change updates
IpSecManager to use InetAddress and prefixLen, and then construct a
LinkAddress internally. LinkAddress is used over the binder interface to
IpSecService to ensure validity.
Bug:
77528639
Test: CTS, Java unit tests ran on walleye
Merged-In: I19e124adef6d9f4992d8293db3190bcf74c95848
Change-Id: I19e124adef6d9f4992d8293db3190bcf74c95848
(cherry picked from commit
3f2c54b7820c3a568890700479230966fdbcf0a4)
Nathan Harold [Fri, 16 Mar 2018 01:06:06 +0000 (18:06 -0700)]
Add AppOps Checks for MANAGE_IPSEC_TUNNELS
Adds support for a new AppOp to permit services to
use IpSec tunnel mode. The IpSecService now needs
a context so change the service mode to a cached
service rather than a static service.
Bug:
66955045
Test: runtest frameworks-net
Merged-In: I17a4a286225b432c3e15ea1587d946189931b4f4
Change-Id: I17a4a286225b432c3e15ea1587d946189931b4f4
(cherry picked from commit
592dadbd43fcb7c5d67e737adb34d07923da90c4)
Nathan Harold [Wed, 21 Mar 2018 22:32:42 +0000 (15:32 -0700)]
Add MANAGE_IPSEC_TUNNELS Permission
Add a new MANAGE_IPSEC_TUNNELS permission and
protect all IPsec Tunnel mode APIs with it.
This permission is only granted to the system or
through an AppOp.
Bug:
66955045
Test: compilation
Merged-In: I0f618373b500c493ef2211bece681f74652a1833
Change-Id: I0f618373b500c493ef2211bece681f74652a1833
(cherry picked from commit
159788455c79fa47847d0c40fcee7aceff2551ae)
Anarghya Mitra [Fri, 8 Jun 2018 01:05:07 +0000 (18:05 -0700)]
Change Quick Settings to account for branded VPNs.
am:
10422896ed
Change-Id: If9b181b5d4175f9418b4c8b0e4a8938b0bc98811
Yu-Han Yang [Fri, 8 Jun 2018 00:46:39 +0000 (17:46 -0700)]
Merge "Disable REQUEST_LOCATION from GNSS HAL by default" into pi-dev
am:
a364b3111a
Change-Id: I4ee77d8ae3417e76c330486205320077b23ea941
Anthony Chen [Fri, 8 Jun 2018 00:24:42 +0000 (17:24 -0700)]
Merge "Remove usage of deprecated DayNightStyle values." into pi-dev
am:
a0d475a43f
Change-Id: I603568a7168fb3b8a4a946d937b754f13b3d917c
Jorim Jaggi [Fri, 8 Jun 2018 00:16:11 +0000 (17:16 -0700)]
Merge "Move nulling of nextFrameCallback" into pi-dev
am:
e4e9ee7951
Change-Id: If988240d948266118a9441ee356ff384b4ff53b5
Lin Guo [Fri, 8 Jun 2018 00:08:30 +0000 (17:08 -0700)]
Only show the volume dialog if the AudioManager.FLAG_SHOW_UI bit is set
Bug:
109841417
Test: manual
Change-Id: Icc803a4b22ceccff7d3e788b9164975a8e395a3b
Anarghya Mitra [Thu, 7 Jun 2018 20:26:14 +0000 (13:26 -0700)]
Change Quick Settings to account for branded VPNs.
Screenshots: https://photos.app.goo.gl/FrnK69TXR86npFmY2
Test: runtest --path frameworks/base/packages/SystemUI/tests/src/com/android/systemui/qs
Bug:
109837832
Change-Id: Ie447e6598ff593ff5d14ec8787db82ba39c9ea54
Yu-Han Yang [Thu, 7 Jun 2018 23:50:08 +0000 (23:50 +0000)]
Merge "Disable REQUEST_LOCATION from GNSS HAL by default" into pi-dev
Chris Forbes [Thu, 7 Jun 2018 23:41:19 +0000 (16:41 -0700)]
pm: Exposing Vulkan 1.1 does not guarantee AHB extension support
Bug: b/
109875843
Change-Id: Ib53fb1a4f7a5a6c055b575b4d8775f8bd62db7a8
Svetoslav Ganov [Thu, 7 Jun 2018 23:23:39 +0000 (23:23 +0000)]
Revert "Allow instant apps to send broadcasts to themselves"
This reverts commit
7b40358fa316038ce6a3243b8706c6f5b7a49536.
Reason for revert: False positive - this works and patch not needed.
bug:
109583877
Change-Id: If708350b03292cfa3bf9841199739e06c82f6c4f
Mathieu Chartier [Thu, 7 Jun 2018 23:27:12 +0000 (23:27 +0000)]
Merge "Add filter for NoPreloadHolders"
Michael Wachenschwanz [Thu, 7 Jun 2018 23:05:25 +0000 (16:05 -0700)]
Merge "Increase Binder Proxy Limit to 6000 for SYSTEM" into pi-dev
am:
f55cce3008
Change-Id: I13c1b629e2531be9d01a07011ccc3a27700dde8b
Aarthi Balachander [Thu, 7 Jun 2018 22:59:53 +0000 (15:59 -0700)]
Merge "Show the bouncer at start up if the headless user flag is set" into pi-dev
am:
36fc3b1a53
Change-Id: I9d4fd38bdfa3c605583436cda9f331148113d551
Beverly [Thu, 7 Jun 2018 18:30:55 +0000 (14:30 -0400)]
Include InCallNotification.ogg in AllAudio.mk file
Test: manual
Change-Id: Ic7dee1ece7231731a6fdab5aa7057ff240b94071
Hongwei Wang [Thu, 7 Jun 2018 19:35:08 +0000 (12:35 -0700)]
Comply with the volume callback change
Bug:
109841417
Test: m -j
Change-Id: I43a139b97f89a666088db39579b068dc76babd56
Eric Laurent [Mon, 21 May 2018 16:28:46 +0000 (09:28 -0700)]
Add field to set A2DP device volume on connect (1/2)
Add a field to setBluetoothA2dpDeviceConnectionStateInt() to allow
Bluetooth to set a volume for the new device when it connects.
Bug:
79529581
Test: Switch repeatedly between devices and see that the old volume isn't
used on the new device or the new volume isn't used on the old device.
Change-Id: Iea13ca8b5c538c999149baba6e9069745ad9466b
Merged-In: I909fa3f40818c595fc977695fbfa1214f9a4de72
(cherry picked from commit
3e6fb6309033c50081c0789b5905d5cd539b38f6)
Yin-Chia Yeh [Thu, 7 Jun 2018 22:28:19 +0000 (15:28 -0700)]
Merge "Camera: update tonemap image in html doc" into pi-dev
am:
beb11a582a
Change-Id: Id2471de89e2d44ae9deaa31144d96218d84ea34b