OSDN Git Service
Bill Yi [Mon, 11 Jun 2018 21:03:15 +0000 (14:03 -0700)]
Merge changes from topic "am-
84e9fe64-a976-466c-a8d7-
d25febc3ff42" into oc-dev am:
5b882b9dd7 am:
9ce893db7d am:
053160d965
am:
a5f49873c1
Change-Id: Iff391bdbc66ec59c30f36fc14e9501c7fb770f30
Bill Yi [Mon, 11 Jun 2018 20:54:10 +0000 (13:54 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d skipped:
ab4ca0c33d am:
d82564708f -s ours am:
2e113959ff -s ours am:
5caff8b3ac -s ours
am:
b63aa6d5bb -s ours
Change-Id: I352891e21e30e5d61ac0224f69c1e3fad181d0b8
Bill Yi [Mon, 11 Jun 2018 20:45:54 +0000 (13:45 -0700)]
Merge changes from topic "am-
f1c23412-1f54-4840-90d6-
b3eb7b06fc83" into oc-dev am:
59f13cbb8a am:
34d73a6f77 am:
331b188275
am:
a3a2117e5f
Change-Id: I65b949695446c745048a29b24c851fcdff714010
Bill Yi [Mon, 11 Jun 2018 20:36:21 +0000 (13:36 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa skipped:
4f7095b464 am:
124cc34793 -s ours am:
b5af202209 -s ours am:
6c409c2e99 -s ours
am:
4256a29fcc -s ours
Change-Id: I1467823190040c77c1a523ee9fa6d33a64140f29
Bill Yi [Mon, 11 Jun 2018 20:32:07 +0000 (13:32 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
faed2889f4 skipped:
091681e295 am:
4228af93a7 -s ours am:
fcd7cc11c7 -s ours am:
927396047c -s ours
am:
73eb5fee8d -s ours
Change-Id: Ia18e5250d7e91b7a9aa227fbe667c22b325eb85a
Bill Yi [Mon, 11 Jun 2018 19:52:45 +0000 (12:52 -0700)]
Merge changes from topic "am-
84e9fe64-a976-466c-a8d7-
d25febc3ff42" into oc-dev am:
5b882b9dd7 am:
9ce893db7d
am:
053160d965
Change-Id: I372e94fff2918832b307e6e7895636cfe0b218f3
Bill Yi [Mon, 11 Jun 2018 19:44:22 +0000 (12:44 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d skipped:
ab4ca0c33d am:
d82564708f -s ours am:
2e113959ff -s ours
am:
5caff8b3ac -s ours
Change-Id: I23a3341bc16e52343d398489b7e74a7903421cac
Bill Yi [Mon, 11 Jun 2018 19:34:18 +0000 (12:34 -0700)]
Merge changes from topic "am-
84e9fe64-a976-466c-a8d7-
d25febc3ff42" into oc-dev am:
5b882b9dd7
am:
9ce893db7d
Change-Id: Ib2119bdd41d9266be01a34281f2b414a9d4d6d32
Bill Yi [Mon, 11 Jun 2018 19:27:12 +0000 (12:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d skipped:
ab4ca0c33d am:
d82564708f -s ours
am:
2e113959ff -s ours
Change-Id: I4e9f42dca080b08b61f706bb474c31c1ee1db4e5
Bill Yi [Mon, 11 Jun 2018 19:10:01 +0000 (12:10 -0700)]
Merge changes from topic "am-
f1c23412-1f54-4840-90d6-
b3eb7b06fc83" into oc-dev am:
59f13cbb8a am:
34d73a6f77
am:
331b188275
Change-Id: Ie7c5f82c79e8844493bd6dc203f294bc0d645150
Bill Yi [Mon, 11 Jun 2018 19:01:59 +0000 (12:01 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa skipped:
4f7095b464 am:
124cc34793 -s ours am:
b5af202209 -s ours
am:
6c409c2e99 -s ours
Change-Id: I1c2d8f7e5ccffd726c7111bb46e87e74616a28a4
Bill Yi [Mon, 11 Jun 2018 19:00:13 +0000 (12:00 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
faed2889f4 skipped:
091681e295 am:
4228af93a7 -s ours am:
fcd7cc11c7 -s ours
am:
927396047c -s ours
Change-Id: Id8ad34a3a125dbe8fc7b19399ace436250ecc3a2
Bill Yi [Mon, 11 Jun 2018 18:52:05 +0000 (11:52 -0700)]
Merge changes from topic "am-
f1c23412-1f54-4840-90d6-
b3eb7b06fc83" into oc-dev am:
59f13cbb8a
am:
34d73a6f77
Change-Id: I92656bba49935224c4b97c8c36aaddeaf7360950
Bill Yi [Mon, 11 Jun 2018 18:45:09 +0000 (11:45 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa skipped:
4f7095b464 am:
124cc34793 -s ours
am:
b5af202209 -s ours
Change-Id: I1a8c18e58b587716dccc478fa188931df79d68c4
Bill Yi [Mon, 11 Jun 2018 18:43:54 +0000 (11:43 -0700)]
Merge changes from topic "am-
84e9fe64-a976-466c-a8d7-
d25febc3ff42" into oc-dev
am:
5b882b9dd7
Change-Id: Ieda6e812da1fb9f3ec55201f606dd4a843f63fd4
Bill Yi [Mon, 11 Jun 2018 18:41:53 +0000 (11:41 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d skipped:
ab4ca0c33d
am:
d82564708f -s ours
Change-Id: Ib7d487392cec9a11e587b50a5b91899a215599a8
Bill Yi [Mon, 11 Jun 2018 18:37:03 +0000 (11:37 -0700)]
Merge changes from topic "am-
f1c23412-1f54-4840-90d6-
b3eb7b06fc83" into oc-dev
am:
59f13cbb8a
Change-Id: I47a507e5c0142357a69e7520973e4f79d3d158a8
Bill Yi [Mon, 11 Jun 2018 18:35:00 +0000 (11:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa skipped:
4f7095b464
am:
124cc34793 -s ours
Change-Id: If5c49902987b4bd076509abf86aafe7407c2525b
Bill Yi [Mon, 11 Jun 2018 18:33:02 +0000 (11:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
faed2889f4 skipped:
091681e295 am:
4228af93a7 -s ours
am:
fcd7cc11c7 -s ours
Change-Id: I795a9504ea8873999aff1aed5ffb508787a903a1
Bill Yi [Mon, 11 Jun 2018 18:21:05 +0000 (11:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
faed2889f4 skipped:
091681e295
am:
4228af93a7 -s ours
Change-Id: I50958128b0b470ee8d2a3ba83660172f210069c0
TreeHugger Robot [Mon, 11 Jun 2018 18:03:31 +0000 (18:03 +0000)]
Merge changes from topic "am-
84e9fe64-a976-466c-a8d7-
d25febc3ff42" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d skipped:
ab4ca0c33d
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:03:15 +0000 (18:03 +0000)]
Merge changes from topic "am-
f1c23412-1f54-4840-90d6-
b3eb7b06fc83" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa skipped:
4f7095b464
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 17:23:46 +0000 (17:23 +0000)]
Merge "Frameworks: convert platformprotos to soong" into pi-dev-plus-aosp
Andreas Gampe [Mon, 11 Jun 2018 16:21:35 +0000 (09:21 -0700)]
Merge "Framework: Disable native-bridge for non-zygote" am:
05c09faad2
am:
5b2e5d32d6
Change-Id: Iba7d16624a518158a8cbe5de0dc94dc0ccf747fd
Jakub Pawlowski [Mon, 11 Jun 2018 16:16:39 +0000 (09:16 -0700)]
Merge "ScanRecord.getServiceData NPE fix" am:
d62f74e806
am:
8d0eb01843
Change-Id: I9a7e94cb51f724da7d089fbe027a06d36ad5ebb4
Andreas Gampe [Mon, 11 Jun 2018 16:11:28 +0000 (09:11 -0700)]
Merge "Framework: Disable native-bridge for non-zygote"
am:
05c09faad2
Change-Id: I2aea1bd9c520ca6bb42bf80bd445da0e86db8136
Jakub Pawlowski [Mon, 11 Jun 2018 16:07:31 +0000 (09:07 -0700)]
Merge "ScanRecord.getServiceData NPE fix"
am:
d62f74e806
Change-Id: I11a254cf633dc5cf9a7c53c992bf49b00f3d274e
Treehugger Robot [Mon, 11 Jun 2018 15:23:38 +0000 (15:23 +0000)]
Merge "Framework: Disable native-bridge for non-zygote"
Jakub Pawlowski [Mon, 11 Jun 2018 14:43:57 +0000 (14:43 +0000)]
Merge "ScanRecord.getServiceData NPE fix"
Jakub Pawlowski [Mon, 4 Jun 2018 17:32:06 +0000 (10:32 -0700)]
ScanRecord.getServiceData NPE fix
Bug:
109662587
Change-Id: I0e9653d9cd7e4b748870bacb6fbcecae535ebb2a
Chalard Jean [Mon, 11 Jun 2018 14:16:08 +0000 (07:16 -0700)]
Merge changes Ifd7d73ad,Id79096fa am:
bfe3b1a691
am:
9f0df265ba
Change-Id: Ibce24e5d55e728a1a08f534fa91b3be0bbc3b990
Chalard Jean [Mon, 11 Jun 2018 13:12:34 +0000 (06:12 -0700)]
Merge changes Ifd7d73ad,Id79096fa
am:
bfe3b1a691
Change-Id: I263f51ba2aafdf8e19e020b2a4f6ff1b8238fa3c
Treehugger Robot [Mon, 11 Jun 2018 11:54:21 +0000 (11:54 +0000)]
Merge changes Ifd7d73ad,Id79096fa
* changes:
Bugfixes in LinkProperties#toString
Cleanup of ConnectivityManager.
Chalard Jean [Thu, 7 Jun 2018 04:28:09 +0000 (13:28 +0900)]
Bugfixes in LinkProperties#toString
We should stop trying to use a human brain to write code
Test: manual
Change-Id: Ifd7d73ad65de0f671466080beacbd97287e17bfe
Chalard Jean [Mon, 4 Jun 2018 07:52:49 +0000 (16:52 +0900)]
Cleanup of ConnectivityManager.
This is not exhaustive, but still an undeniable improvement.
Test: runtest frameworks-net
Change-Id: Id79096faf20eec80de7c17b261ef338b895af1e0
Ryo Hashimoto [Mon, 11 Jun 2018 09:29:56 +0000 (02:29 -0700)]
Merge "Use ParcelFileDescriptor's C++ implementation in libbinder" am:
20e243d627
am:
9e2177b492
Change-Id: Ica2a4ef98eba9a5360398b6d5a05f141e0bb6f93
Ryo Hashimoto [Mon, 11 Jun 2018 08:25:46 +0000 (01:25 -0700)]
Merge "Use ParcelFileDescriptor's C++ implementation in libbinder"
am:
20e243d627
Change-Id: I0bc6158d1c37ee8a02450dee55ca6732d878fde3
Treehugger Robot [Mon, 11 Jun 2018 07:27:41 +0000 (07:27 +0000)]
Merge "Use ParcelFileDescriptor's C++ implementation in libbinder"
Chalard Jean [Mon, 11 Jun 2018 05:17:20 +0000 (22:17 -0700)]
Merge "No-op cleanup of ConnectivityService." am:
a190a41b51
am:
4abdbaccb3
Change-Id: I7fae0ed908cca7a4e23c37536f59b4c5df0be862
Chalard Jean [Mon, 11 Jun 2018 05:09:18 +0000 (22:09 -0700)]
Merge "No-op cleanup of ConnectivityService."
am:
a190a41b51
Change-Id: I9ec9633a85b8b2298f90419da2a73c540b6e6805
Treehugger Robot [Mon, 11 Jun 2018 04:57:31 +0000 (04:57 +0000)]
Merge "No-op cleanup of ConnectivityService."
junyulai [Mon, 11 Jun 2018 04:51:42 +0000 (21:51 -0700)]
Merge "Copy clat modified linkProperties into new one." am:
33b5abb6f8
am:
0242723e09
Change-Id: If39f47cc2caf6a119ff7e237cd8a06b069dca04e
junyulai [Mon, 11 Jun 2018 04:44:16 +0000 (21:44 -0700)]
Merge "Copy clat modified linkProperties into new one."
am:
33b5abb6f8
Change-Id: Ia1f9ab3d5c3b889beddb4dda56ad3389c4967275
Treehugger Robot [Mon, 11 Jun 2018 03:26:26 +0000 (03:26 +0000)]
Merge "Copy clat modified linkProperties into new one."
Android Build Merger (Role) [Sun, 10 Jun 2018 06:30:57 +0000 (06:30 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
faed2889f4 skipped:
091681e295
Change-Id: Idb34650f4e4ffa9086addb3fc25cf528c9b60aa8
Android Build Merger (Role) [Sun, 10 Jun 2018 06:30:51 +0000 (06:30 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
faed2889f4
Change-Id: Ic0e6aac64c5724221ca6fa3d75d0d0d463cfe9ab
Bill Yi [Sun, 10 Jun 2018 06:30:29 +0000 (23:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9dcb973ffe7bab8894c863087532615f8c360806
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 10 Jun 2018 06:24:19 +0000 (06:24 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa skipped:
4f7095b464
Change-Id: I7b5711eabd8f101cc5c268c2469a7f94582e4144
Android Build Merger (Role) [Sun, 10 Jun 2018 06:24:12 +0000 (06:24 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa
Change-Id: I6e31b858c5da4119d4c331c2d568cb80e77711b5
Bill Yi [Sun, 10 Jun 2018 06:23:50 +0000 (23:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icccc1ebb6e107e09ed59b9b1b6a235e6d2f4f6fe
Auto-generated-cl: translation import
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
Android Build Merger (Role) [Sun, 10 Jun 2018 05:32:27 +0000 (05:32 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d skipped:
ab4ca0c33d
Change-Id: I86175e2cc228f4675e51e31597dbb8df7139a84d
Android Build Merger (Role) [Sun, 10 Jun 2018 05:32:22 +0000 (05:32 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d
Change-Id: Iff4d2ee449e66e45d078e3ed7b756de703099f9c
Bill Yi [Sun, 10 Jun 2018 05:32:06 +0000 (22:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I78cebcdc6b07666675b4ef17fc9052e02b0ad087
Auto-generated-cl: translation import
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"
OSDN Git Service
