OSDN Git Service
Mike Digman [Tue, 12 Jun 2018 21:54:57 +0000 (14:54 -0700)]
Merge "Make rotate nav+qs icon consistent, understandable" into pi-dev
am:
f8dc8e378a
Change-Id: If0731ddfa7fb95e4b810ca80115b4d1c8714a875
Pengquan Meng [Tue, 12 Jun 2018 21:38:22 +0000 (21:38 +0000)]
Merge "Remove internal ApnSetting." into pi-dev-plus-aosp
Mike Digman [Tue, 12 Jun 2018 20:27:00 +0000 (20:27 +0000)]
Merge "Make rotate nav+qs icon consistent, understandable" into pi-dev
Neil Fuller [Tue, 12 Jun 2018 20:11:34 +0000 (13:11 -0700)]
[automerger skipped] Fix a syntax error in SystemServiceRegistry
am:
10e276a24d -s ours
Change-Id: I79cb70aef217c3ec4bd42f0023e009506836a191
Neil Fuller [Tue, 12 Jun 2018 19:10:22 +0000 (20:10 +0100)]
Fix a syntax error in SystemServiceRegistry
The syntax error was introduced by a bad conflict resolution
in http://ag/
4324946.
Bug:
110097023
Test: Inspection only
Merged-In: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
Change-Id: I546f2d010faa6f75033cf7e3e51ef7ed640854ed
Neil Fuller [Tue, 12 Jun 2018 18:26:56 +0000 (11:26 -0700)]
Merge "Simple pass-through TimeDetectorService" am:
cb749e2e50
am:
415585f2a5
Change-Id: Id0259be3d9ad4e869c5e96cb166b8654d52c1ad7
Selim Cinek [Tue, 12 Jun 2018 18:19:08 +0000 (11:19 -0700)]
Merge "Keeping the lockdown state in sync with the notification list" into pi-dev
am:
1d207b3af5
Change-Id: I0ee8ca85bb234e86bbaba0ec7e983861b03546eb
Neil Fuller [Tue, 12 Jun 2018 18:17:51 +0000 (11:17 -0700)]
Merge "Simple pass-through TimeDetectorService"
am:
cb749e2e50
Change-Id: Ic2e3d3c3f9181ef4054f599baf4ac086ec21d8bd
Selim Cinek [Tue, 12 Jun 2018 18:04:01 +0000 (18:04 +0000)]
Merge "Keeping the lockdown state in sync with the notification list" into pi-dev
Treehugger Robot [Tue, 12 Jun 2018 17:01:25 +0000 (17:01 +0000)]
Merge "Simple pass-through TimeDetectorService"
Neil Fuller [Fri, 8 Jun 2018 17:44:49 +0000 (18:44 +0100)]
Simple pass-through TimeDetectorService
This is sufficient to wire up time detection from telephony
to the new service without breaking time detection.
This cherry-pick contains a small change: to use
SystemClock.elapsedRealtime() instead of the newer
SystemClock.elapsedRealtimeClock() with Clock.millis().
Bug:
78217059
Test: atest FrameworksServicesTests:com.android.server.timedetector
Test: atest FrameworksCoreTests:android.util.TimestampedValueTest
Merged-In: Id7175878dc22e5272c31f3e478af4b0e4183b62b
Change-Id: Id7175878dc22e5272c31f3e478af4b0e4183b62b
(cherry picked from commit
24836bfb1564b1f98c322108a924965a8dbbee4f)
Chalard Jean [Tue, 12 Jun 2018 14:04:45 +0000 (07:04 -0700)]
Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ... am:
6c0106b57f
am:
85bae863f5
Change-Id: Ica8e290909a34976e00bebbb622dd49d8f0d6b8d
Chalard Jean [Tue, 12 Jun 2018 13:57:33 +0000 (06:57 -0700)]
Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ...
am:
6c0106b57f
Change-Id: I86bc83e2bd859b48017f12832e9ff0080ec162b8
yuemingw [Mon, 9 Apr 2018 15:41:54 +0000 (16:41 +0100)]
Remove internal ApnSetting.
Bug:
77511388
Test: atest FrameworksTelephonyTests
Change-Id: I9757ef4aae269d828c98a7363c98629c9be74846
Neil Fuller [Tue, 12 Jun 2018 13:36:14 +0000 (06:36 -0700)]
resolve merge conflicts of
5e1d95b0cc05eb1a6bf25a13223601f2e8f8fccb to stage-aosp-master
am:
79d42a61e4
Change-Id: I8dcebef6e996dfaec01934552aa0f3d6f8c9053a
Neil Fuller [Tue, 12 Jun 2018 13:14:13 +0000 (14:14 +0100)]
resolve merge conflicts of
5e1d95b0cc05eb1a6bf25a13223601f2e8f8fccb to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic5527b29cbe8c84d2053be849cf09df5341e4790
Chalard Jean [Tue, 12 Jun 2018 12:23:59 +0000 (12:23 +0000)]
Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ...
* changes:
[PT06] Move setGlobalProxy into ProxyTracker
[PT05] Move sendProxyBroadcast into ProxyTracker.
[PT04] Move PacManager into ProxyTracker.
[PT03] Move some more code into ProxyTracker.
[PT02] Move static methods to ProxyTracker
[PT01] Introduce ProxyTracker
Remove a useless parameter.
Small cleanup of Network.
Cleanup of LinkProperties.
Chalard Jean [Thu, 7 Jun 2018 09:37:59 +0000 (18:37 +0900)]
[PT06] Move setGlobalProxy into ProxyTracker
Test: runtest
Change-Id: I6abd2221882db368a411b7174c66d8bd3b6b5110
Chalard Jean [Thu, 7 Jun 2018 10:30:29 +0000 (19:30 +0900)]
[PT05] Move sendProxyBroadcast into ProxyTracker.
Test: runtest
Change-Id: I2c149d29d4b75d3978021b940b6bc58f677b8d17
Chalard Jean [Thu, 7 Jun 2018 10:20:08 +0000 (19:20 +0900)]
[PT04] Move PacManager into ProxyTracker.
Test: runtest
Change-Id: I45d22857459fe1746d484ac04f8d5cd81fc61835
Chalard Jean [Thu, 7 Jun 2018 09:02:37 +0000 (18:02 +0900)]
[PT03] Move some more code into ProxyTracker.
Add finals and annotations. Remove comments that have lost their
context (they were in the context of disabling a permission check
that had been added, but constituted an API change that would not
serve any real purpose).
Test: runtest
Change-Id: I1f879b2c105d2127072b88233d72097a0d78fe14
Chalard Jean [Thu, 7 Jun 2018 08:41:29 +0000 (17:41 +0900)]
[PT02] Move static methods to ProxyTracker
No logic changes. Only changes are adding nullability annotations,
final modifiers, and adding an s in a comment.
Test: runtests
Change-Id: If4986a25bb36819de8ff459c4c0439c56d4e5a50
Chalard Jean [Thu, 7 Jun 2018 07:44:04 +0000 (16:44 +0900)]
[PT01] Introduce ProxyTracker
The goal of this is to simplify ConnectivityService by reducing
the amount of code it contains. This is small enough to be obviously
correct and followup changes will move code into this class.
Test: runtest
Change-Id: Ic5ab19b521e98ae397c9bf657856820304362fbb
Chalard Jean [Thu, 7 Jun 2018 07:11:34 +0000 (16:11 +0900)]
Remove a useless parameter.
This argument is useless because all its callers pass the same
value : false.
Test: runtest
Change-Id: Id921caa4ffadef535a5bbcfea052283a07320b28
Chalard Jean [Thu, 7 Jun 2018 04:46:52 +0000 (13:46 +0900)]
Small cleanup of Network.
Test: runtest
Change-Id: I56dbd37bb8f890938d360f45835de72be4beb91a
Chalard Jean [Thu, 7 Jun 2018 04:27:00 +0000 (13:27 +0900)]
Cleanup of LinkProperties.
Test: runtest
Change-Id: I7299de93a79901635ce755a2d933666ee43767d5
Neil Fuller [Tue, 12 Jun 2018 09:50:32 +0000 (09:50 +0000)]
Merge "Minimum viable TimeDetectorService"
Winson Chung [Tue, 12 Jun 2018 07:34:56 +0000 (00:34 -0700)]
Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev
am:
b2dac061bb
Change-Id: Ia09141c88e964ccfafe75fa6a0d0c7e19ddeadd4
Winson Chung [Tue, 12 Jun 2018 06:45:15 +0000 (06:45 +0000)]
Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev
Jean-Michel Trivi [Tue, 12 Jun 2018 05:18:53 +0000 (22:18 -0700)]
Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev
am:
8a12361b8c
Change-Id: Ia47fe3acf3d637d42d0ce3efaa6be1e0718e2acd
TreeHugger Robot [Tue, 12 Jun 2018 03:59:07 +0000 (03:59 +0000)]
Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev
Bill Yi [Tue, 12 Jun 2018 02:09:11 +0000 (19:09 -0700)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev am:
c70d882667 am:
c262f7a96a am:
ac40bb76a1
am:
f8fe538f07
Change-Id: I5b5360c99aeb67e14900d178f11faf435b7c42a3
Bill Yi [Tue, 12 Jun 2018 01:59:28 +0000 (18:59 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39 am:
b1615a6d90 -s ours am:
2c56e9b54b -s ours am:
c37cca5739 -s ours
am:
9b70877ea8 -s ours
Change-Id: Iac4584e21e939ea6f770a64d7e5c16a561741bf8
Bill Yi [Tue, 12 Jun 2018 01:52:55 +0000 (18:52 -0700)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev am:
836d1db239 am:
f527941ec8 am:
f4a3d1faf2
am:
88db3b5aae
Change-Id: Ia79761d8fb5b1bbdad7a0230dd5d1daef998ead2
Bill Yi [Tue, 12 Jun 2018 01:43:20 +0000 (18:43 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe am:
6d30123999 -s ours am:
f9efc3043a -s ours am:
9e7657c13d -s ours
am:
7609e23612 -s ours
Change-Id: I556cc2268f3feb0344b21be2f4a57cd15627047d
Bill Yi [Tue, 12 Jun 2018 01:36:57 +0000 (18:36 -0700)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev am:
3bbe3c7c93 am:
24701167ba am:
689cf0f8a2
am:
995c542d0c
Change-Id: I267178d0ab2cf05abdc5d685e139f05cbcc427ca
Bill Yi [Tue, 12 Jun 2018 01:27:17 +0000 (18:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce am:
71f5cfa650 -s ours am:
f2ce740a1e -s ours am:
b10ebef583 -s ours
am:
7cea26fc9e -s ours
Change-Id: I3856a4767bab27699a68b765287e26b689a3906d
Bill Yi [Tue, 12 Jun 2018 01:21:05 +0000 (18:21 -0700)]
Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into oc-dev am:
bd9caf4c6f am:
2b605d89b9 am:
64c1873c30
am:
6dbef2a740
Change-Id: Ibb8f520e2070a880028866931319ccbb60e373af
Bill Yi [Tue, 12 Jun 2018 01:11:30 +0000 (18:11 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743 skipped:
5e66cc00a4 am:
dafe5854dd -s ours am:
0c61c9baf6 -s ours am:
7567755399 -s ours
am:
287d484b23 -s ours
Change-Id: Ia37e5c85013732a3a0e99a6829a58f792b123499
Selim Cinek [Tue, 12 Jun 2018 00:26:34 +0000 (17:26 -0700)]
Keeping the lockdown state in sync with the notification list
Whenever the lockdown was changed, the UI wasn't consistently
updated, but only once another notification / update came
in, which lead to notifications being invisisible or visible
when they shouldn't have been.
Change-Id: I17c1b4e0ef58d6aa05f4404e52e07a098d4fce4e
Fixes:
78020486
Test: manual, hit lockdown observe notification gone, coming back when unlocked
Brad Ebinger [Tue, 12 Jun 2018 00:32:30 +0000 (17:32 -0700)]
[automerger skipped] Merge "Update Docs to clarify using a Message across IPC" am:
0be0692691 -s ours
am:
b57dfe26cf -s ours
Change-Id: Ie3294bee1121280f07d34b4ecae451779646678f
Winson Chung [Mon, 11 Jun 2018 23:58:27 +0000 (23:58 +0000)]
Revert "Defer stop for all activities becoming invisible"
This reverts commit
b824f87c65216e4dfe5e9ab0e63795466836bc0f (for b/
80313326)
Reason for revert: Cts issues (b/
110032866)
Bug:
80313326
Bug:
110032866
Change-Id: Iaca3a8650d30b475ef4331e98b4b14377072ee4d
Mike Digman [Mon, 11 Jun 2018 18:41:33 +0000 (11:41 -0700)]
Make rotate nav+qs icon consistent, understandable
Now using the same iconography (but different angle) for nav
and qs. Note nav viewport, size and pivot (for motion) change
is intentional to match other navbar icon sizing.
Test: manual
Change-Id: I1abb33130cc724b6e63e008cf7301ebce383c8d1
Fixes:
110052596
Bill Yi [Mon, 11 Jun 2018 22:43:09 +0000 (15:43 -0700)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev am:
c70d882667 am:
c262f7a96a
am:
ac40bb76a1
Change-Id: Idecbdcc5616a974fe75d99667ec4a5e8d37d97c5
Bill Yi [Mon, 11 Jun 2018 22:35:45 +0000 (15:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39 am:
b1615a6d90 -s ours am:
2c56e9b54b -s ours
am:
c37cca5739 -s ours
Change-Id: If954d237d06c522c78198b0fadd8c6394978855a
Brad Ebinger [Mon, 11 Jun 2018 22:24:19 +0000 (15:24 -0700)]
[automerger skipped] Merge "Update Docs to clarify using a Message across IPC"
am:
0be0692691 -s ours
Change-Id: I1d3887c7d4a868a1f1b56c0d2e4f824eef29fb3a
Bill Yi [Mon, 11 Jun 2018 22:17:06 +0000 (15:17 -0700)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev am:
836d1db239 am:
f527941ec8
am:
f4a3d1faf2
Change-Id: I5bff44b8b6e7384eada300a2c904ab11c12e028f
TreeHugger Robot [Mon, 11 Jun 2018 22:10:59 +0000 (22:10 +0000)]
Merge "Remove test-* sources for Metalava api-stubs." into pi-dev-plus-aosp
Bill Yi [Mon, 11 Jun 2018 22:09:52 +0000 (15:09 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe am:
6d30123999 -s ours am:
f9efc3043a -s ours
am:
9e7657c13d -s ours
Change-Id: Ie100fd774ad3262f3edf1b5b2baaa3786200dccc
Bill Yi [Mon, 11 Jun 2018 22:04:23 +0000 (15:04 -0700)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev am:
3bbe3c7c93 am:
24701167ba
am:
689cf0f8a2
Change-Id: I211002b40f5acf9f7ad0a44e4530019df72c3b7c
Bill Yi [Mon, 11 Jun 2018 21:57:09 +0000 (14:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce am:
71f5cfa650 -s ours am:
f2ce740a1e -s ours
am:
b10ebef583 -s ours
Change-Id: Ieb35e183766df1fae623f85ccb2c3a3291b35085
Bill Yi [Mon, 11 Jun 2018 21:51:44 +0000 (14:51 -0700)]
Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into oc-dev am:
bd9caf4c6f am:
2b605d89b9
am:
64c1873c30
Change-Id: Ie4a67f372f3a7d187a7c7fe9c5d364c460535376
Bill Yi [Mon, 11 Jun 2018 21:44:34 +0000 (14:44 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743 skipped:
5e66cc00a4 am:
dafe5854dd -s ours am:
0c61c9baf6 -s ours
am:
7567755399 -s ours
Change-Id: If1fa2cf8485670184771de6faf7042b7c7b227eb
Bill Yi [Mon, 11 Jun 2018 21:43:19 +0000 (14:43 -0700)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev am:
c70d882667
am:
c262f7a96a
Change-Id: If96c64288656012f02de0edfd0d8cf7ff26abae4
Bill Yi [Mon, 11 Jun 2018 21:36:55 +0000 (14:36 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39 am:
b1615a6d90 -s ours
am:
2c56e9b54b -s ours
Change-Id: I947aee957d91c286204282e84162e9733ace9018
Bill Yi [Mon, 11 Jun 2018 21:31:45 +0000 (14:31 -0700)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev am:
836d1db239
am:
f527941ec8
Change-Id: I641ba8de65451ddfab0bd38dcdb09d98f1039fb1
Bill Yi [Mon, 11 Jun 2018 21:25:28 +0000 (14:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe am:
6d30123999 -s ours
am:
f9efc3043a -s ours
Change-Id: Ia4ef7b14406c4f0f15b9d17d107308f93282684b
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 21:01:09 +0000 (14:01 -0700)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev am:
3bbe3c7c93
am:
24701167ba
Change-Id: I2cc8202e1abaf739a71126665599c3b262f5e7d7
Bill Yi [Mon, 11 Jun 2018 20:54:34 +0000 (13:54 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce am:
71f5cfa650 -s ours
am:
f2ce740a1e -s ours
Change-Id: Ibcaa1f68b57714de2a7295d93d1875274b750071
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:49:02 +0000 (13:49 -0700)]
Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into oc-dev am:
bd9caf4c6f
am:
2b605d89b9
Change-Id: I1686e2207e5764167e1e75fcbf4d0be08bf4590d
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:42:05 +0000 (13:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743 skipped:
5e66cc00a4 am:
dafe5854dd -s ours
am:
0c61c9baf6 -s ours
Change-Id: Ie95321f3e530034575a32399abcb3d07f552c0e9
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
Brad Ebinger [Mon, 11 Jun 2018 19:56:07 +0000 (19:56 +0000)]
Merge "Update Docs to clarify using a Message across IPC"
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:26:55 +0000 (12:26 -0700)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev
am:
c70d882667
Change-Id: I12e4db4d4d67cac9aa22f9c3fab1d141f29eb54b
Bill Yi [Mon, 11 Jun 2018 19:24:25 +0000 (12:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39
am:
b1615a6d90 -s ours
Change-Id: I9f949a268c9c25c19c731269b3299b4ca2d7aa28
Bill Yi [Mon, 11 Jun 2018 19:19:55 +0000 (12:19 -0700)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev
am:
836d1db239
Change-Id: I519b06f3c9f41b874d0c1f37f0494bbbd080e50e
Bill Yi [Mon, 11 Jun 2018 19:17:38 +0000 (12:17 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe
am:
6d30123999 -s ours
Change-Id: I1f2ad23fa8c9975b1be5e089a4001e5871958aee
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:56:42 +0000 (11:56 -0700)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev
am:
3bbe3c7c93
Change-Id: I15050b23d75c15ca69d1aeadddef4f8f955276ef
Bill Yi [Mon, 11 Jun 2018 18:54:34 +0000 (11:54 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce
am:
71f5cfa650 -s ours
Change-Id: Ia5633210e4fced8acfffa5cde6588b3159f1036f
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:50:24 +0000 (11:50 -0700)]
Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into oc-dev
am:
bd9caf4c6f
Change-Id: I04decd84fba3ec690b6d77d2880b14245810b4fd
Bill Yi [Mon, 11 Jun 2018 18:48:00 +0000 (11:48 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743 skipped:
5e66cc00a4
am:
dafe5854dd -s ours
Change-Id: I7f9086ba7bf5a1754e8dd5e46ccf080b0659b3b0
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:19:38 +0000 (18:19 +0000)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:11:29 +0000 (18:11 +0000)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:06:41 +0000 (18:06 +0000)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:05:42 +0000 (18:05 +0000)]
Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743 skipped:
5e66cc00a4
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743
Import translations. DO NOT MERGE
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
OSDN Git Service
