OSDN Git Service
TreeHugger Robot [Wed, 6 Jun 2018 07:42:26 +0000 (07:42 +0000)]
Merge "Fix broken links in @see tags in framework docs."
Junyu Lai [Wed, 6 Jun 2018 06:55:07 +0000 (23:55 -0700)]
Merge "Copy clat modified linkProperties into new one." into pi-dev am:
183ec8ee35
am:
dc8059eea6
Change-Id: Id266fcd674f67e841a3a79a414ae04d80e3a2943
Junyu Lai [Wed, 6 Jun 2018 06:46:27 +0000 (23:46 -0700)]
Merge "Copy clat modified linkProperties into new one." into pi-dev
am:
183ec8ee35
Change-Id: Icbaa50cde14a3d00e151c1175d214cbf186fa74a
Junyu Lai [Wed, 6 Jun 2018 06:36:39 +0000 (06:36 +0000)]
Merge "Copy clat modified linkProperties into new one." into pi-dev
Martijn Coenen [Wed, 6 Jun 2018 05:51:58 +0000 (22:51 -0700)]
Merge "Serialize calls into BinderProxy." into pi-dev am:
051b63d4b3
am:
e374ec2355
Change-Id: I28c17f46798f95eb1072b9cd9c14560de07fd9aa
Martijn Coenen [Wed, 6 Jun 2018 05:44:06 +0000 (22:44 -0700)]
Merge "Serialize calls into BinderProxy." into pi-dev
am:
051b63d4b3
Change-Id: I9d725b05bc4b00eec7c6421e1a3313d6730ad042
Martijn Coenen [Wed, 6 Jun 2018 05:33:14 +0000 (05:33 +0000)]
Merge "Serialize calls into BinderProxy." into pi-dev
Erik Kline [Wed, 6 Jun 2018 04:32:26 +0000 (21:32 -0700)]
[automerger skipped] Merge "Randomize the local Wifi IPv4 address" into pi-dev am:
046bb433c7 -s ours
am:
5de5c77efb -s ours
Change-Id: I2d5a3002ec36e68b32a160006315660348b460c7
Erik Kline [Wed, 6 Jun 2018 04:23:13 +0000 (21:23 -0700)]
[automerger skipped] Merge "Randomize the local Wifi IPv4 address" into pi-dev
am:
046bb433c7 -s ours
Change-Id: I065a097c028e1ff366ffb201879b8124183dd781
TreeHugger Robot [Wed, 6 Jun 2018 04:12:31 +0000 (04:12 +0000)]
Merge "Randomize the local Wifi IPv4 address" into pi-dev
junyulai [Tue, 5 Jun 2018 08:10:04 +0000 (16:10 +0800)]
Copy clat modified linkProperties into new one.
updateLinkProperties copied the linkProperties in networkAgent,
but the clat fix-up function did not copy stacked link into new one.
This caused an incorrect clat iface removal, and the IPv4 network
to be unreachable.
Bug:
80261579
Test: 1. ping after ipv6 only data call with 2g voice call on/off
2. runtest frameworks-net
3. run cts -m CtsNetTestCases
Change-Id: Ide47a3b0680dddfcf3e2e759a59b19aee3605050
Todd Kennedy [Wed, 6 Jun 2018 03:34:54 +0000 (20:34 -0700)]
Merge "Allow instant apps to launch instant apps" into pi-dev am:
a4155c751f
am:
e9cbe91603
Change-Id: I90bcb89fa73cd8df6e2194794812baecbe8799fb
Eugene Susla [Wed, 6 Jun 2018 03:28:33 +0000 (20:28 -0700)]
Merge "Fix DefaultPermissionGrantPolicyTest" into pi-dev am:
536cb9c426
am:
bb966bd945
Change-Id: I01f2f94adcd2c4e968cd3fb82b5dd32a06eddaf2
George Burgess IV [Wed, 6 Jun 2018 03:23:59 +0000 (20:23 -0700)]
Merge "Fix a 'memory leak'" am:
38e7338d92 am:
bc49cb8460
am:
02bf04ac01
Change-Id: I9113510f9fb0b46bf481a08009bd0c8a4080bc65
Todd Kennedy [Wed, 6 Jun 2018 03:20:03 +0000 (20:20 -0700)]
Merge "Allow instant apps to launch instant apps" into pi-dev
am:
a4155c751f
Change-Id: I42451b9d0b8e8dc788289a2dd5f75cde1b353309
Erik Kline [Tue, 29 May 2018 10:24:43 +0000 (19:24 +0900)]
Randomize the local Wifi IPv4 address
Also: address a few "error prone" warnings, adding @Override where missing
Test: as follows
- built, flashed, booted
- wifi tethering uses a randomized address, DHCPv4 and DNS works
Bug:
32163131
Bug:
70673901
Merged-In: I47d75c32ccd4bcbbb2f05637fcbae216d7e15015
Merged-In: I8f8397978a13c8b2303dfcd950700b447ea61d3c
Change-Id: Icfabc48f2cf97b362ce292747f47021e84b900da
TreeHugger Robot [Wed, 6 Jun 2018 03:09:48 +0000 (03:09 +0000)]
Merge "Allow instant apps to launch instant apps" into pi-dev
Eugene Susla [Wed, 6 Jun 2018 03:01:26 +0000 (20:01 -0700)]
Merge "Fix DefaultPermissionGrantPolicyTest" into pi-dev
am:
536cb9c426
Change-Id: I209b829cb62da4da9968eac3c5f92e52672a4b82
George Burgess IV [Wed, 6 Jun 2018 02:56:22 +0000 (19:56 -0700)]
Merge "Fix a 'memory leak'" am:
38e7338d92
am:
bc49cb8460
Change-Id: I3ecf0ecdf20bb61bda76fff547f920040ded47d6
Henry Liu [Wed, 6 Jun 2018 02:39:42 +0000 (02:39 +0000)]
Merge "Fix default browser is reset after restoring"
TreeHugger Robot [Wed, 6 Jun 2018 02:20:42 +0000 (02:20 +0000)]
Merge "Fix DefaultPermissionGrantPolicyTest" into pi-dev
George Burgess IV [Wed, 6 Jun 2018 02:17:16 +0000 (19:17 -0700)]
Merge "Fix a 'memory leak'"
am:
38e7338d92
Change-Id: Ie6670cd3f6fe1405859d75d2454ec6894f5c5913
Akinobu Nakashima [Wed, 6 Jun 2018 01:32:09 +0000 (18:32 -0700)]
Merge "Suppress AID log on adb logcat" into pi-dev am:
96e843bbcc
am:
3b09f97552
Change-Id: I72b0c0bff1dc8925c9687c1b2c39ab27e9c2d428
Atanas Kirilov [Wed, 6 Jun 2018 01:22:06 +0000 (18:22 -0700)]
[automerger skipped] Merge changes from topic "am-
f5dc500e-4d32-4849-891e-
c618cef666de" into oc-dev am:
c3b4881ea5 am:
4f74605d11 am:
94fbd36ef8 -s ours am:
7e4faf89ec -s ours
am:
efabc7bb29 -s ours
Change-Id: Ia02c2ead33f7de57bf45bb56b5becd7dfd1cc804
Felipe Leme [Wed, 6 Jun 2018 01:09:50 +0000 (18:09 -0700)]
Merge "Log FIELD_AUTOFILL_SESSION_ID as string." into pi-dev am:
efa585d96a
am:
efc5e5a971
Change-Id: I0770d7c5e091051391529a51a8ef41cb9209d5a4
Dianne Hackborn [Wed, 6 Jun 2018 01:03:40 +0000 (18:03 -0700)]
Merge "Fix issue #
109746350: startWatchingMode fails on P" into pi-dev am:
e6fde14579
am:
ea796ab0f2
Change-Id: I7c51ca67c5e0b4418a0752768a60cabc210a6432
Akinobu Nakashima [Wed, 6 Jun 2018 01:01:23 +0000 (18:01 -0700)]
Merge "Suppress AID log on adb logcat" into pi-dev
am:
96e843bbcc
Change-Id: I7c99d56eccc07b9c3ceec7e2da05132a7d4727c5
Atanas Kirilov [Wed, 6 Jun 2018 00:54:10 +0000 (17:54 -0700)]
[automerger skipped] Merge changes from topic "am-
f5dc500e-4d32-4849-891e-
c618cef666de" into oc-dev am:
c3b4881ea5 am:
4f74605d11 am:
94fbd36ef8 -s ours
am:
7e4faf89ec -s ours
Change-Id: Idddfb01b117e806ab49a3b4e9e128a11912cfb02
Ruchi Kandoi [Wed, 6 Jun 2018 00:52:22 +0000 (17:52 -0700)]
Merge "Merge "Suppress AID log on adb logcat" am:
e72aecb655 am:
3acdcfda75" into pi-dev-plus-aosp
am:
2a25678037
Change-Id: I38379b60afbc0c75ecd4126ab3a4ae2c2bec6093
TreeHugger Robot [Wed, 6 Jun 2018 00:44:46 +0000 (00:44 +0000)]
Merge "Suppress AID log on adb logcat" into pi-dev
Felipe Leme [Wed, 6 Jun 2018 00:42:10 +0000 (17:42 -0700)]
Merge "Log FIELD_AUTOFILL_SESSION_ID as string." into pi-dev
am:
efa585d96a
Change-Id: Iab4f5cc70bd11241b83572c243c7a66c50fd04a7
Ying Zheng [Wed, 6 Jun 2018 00:40:54 +0000 (17:40 -0700)]
Merge "Fix a calling loop for getAllUsers." into pi-dev am:
e02f32b921
am:
abb6aad8e5
Change-Id: Ic7cf84ebb2d054b73641fa98117da356d254ee67
Atanas Kirilov [Wed, 6 Jun 2018 00:39:01 +0000 (17:39 -0700)]
[automerger skipped] Merge changes from topic "am-
f5dc500e-4d32-4849-891e-
c618cef666de" into oc-dev am:
c3b4881ea5 am:
4f74605d11
am:
94fbd36ef8 -s ours
Change-Id: I6ebb4b10741f702572574076cebe711605c01a2e
Dianne Hackborn [Wed, 6 Jun 2018 00:37:16 +0000 (17:37 -0700)]
Merge "Fix issue #
109746350: startWatchingMode fails on P" into pi-dev
am:
e6fde14579
Change-Id: Ifd929e3f72272ae0f4f451e9aa046ca49ff73ebb
Dan Sandler [Wed, 6 Jun 2018 00:35:49 +0000 (17:35 -0700)]
Merge "Delay pruning direct share targets." into pi-dev am:
22385d9d4e
am:
396330a584
Change-Id: I9fe64d0896db76b06c2dbeca706795f280b058f3
Android Build Merger (Role) [Wed, 6 Jun 2018 00:26:40 +0000 (00:26 +0000)]
Merge "Merge "Suppress AID log on adb logcat" am:
e72aecb655 am:
3acdcfda75" into pi-dev-plus-aosp
Ruchi Kandoi [Wed, 6 Jun 2018 00:26:19 +0000 (17:26 -0700)]
Merge "Suppress AID log on adb logcat" am:
e72aecb655
am:
3acdcfda75
Change-Id: I3fb09ecad76a932bbbbcb25a04b59376a629f723
Ying Zheng [Wed, 6 Jun 2018 00:25:13 +0000 (17:25 -0700)]
Merge "Fix a calling loop for getAllUsers." into pi-dev
am:
e02f32b921
Change-Id: I86015d504c1a893b8b77d41c804fac4c1ef22c5f
TreeHugger Robot [Wed, 6 Jun 2018 00:24:40 +0000 (00:24 +0000)]
Merge "Log FIELD_AUTOFILL_SESSION_ID as string." into pi-dev
Wale Ogunwale [Wed, 6 Jun 2018 00:13:55 +0000 (17:13 -0700)]
Merge "Revert "Enable WM.DEBUG_WALLPAPER_LIGHT logs"" into pi-dev am:
0b9a87c661
am:
22d951ef38
Change-Id: Id7d4317d44e6f86fbdeaf622a06ac7075d4ff014
Eugene Susla [Wed, 6 Jun 2018 00:06:02 +0000 (17:06 -0700)]
Fix DefaultPermissionGrantPolicyTest
Fixes:
109665265
Test: check afterwards that the failure no longer occurs
Change-Id: I8ddb3052fa505ea4cd0a799a9225ca7991657141
Todd Kennedy [Mon, 4 Jun 2018 21:26:24 +0000 (14:26 -0700)]
Allow instant apps to launch instant apps
Instant apps should be able to launch other instant apps indirectly
using a web URI or with the MATCH_EXTERNAL flag set..
Change-Id: I2566937dd5d47076701c49435365dedd8593067a
Fixes:
92742631
Test: atest CtsAppSecurityHostTestCases:EphemeralTest
Dan Sandler [Tue, 5 Jun 2018 23:55:06 +0000 (16:55 -0700)]
Merge "Delay pruning direct share targets." into pi-dev
am:
22385d9d4e
Change-Id: Ic94163018248073c54416a2196591af98e22e944
Wale Ogunwale [Tue, 5 Jun 2018 23:49:26 +0000 (16:49 -0700)]
Merge "Revert "Enable WM.DEBUG_WALLPAPER_LIGHT logs"" into pi-dev
am:
0b9a87c661
Change-Id: I84760c33a418179cf4a98d9b963af7906820d936
Treehugger Robot [Tue, 5 Jun 2018 23:29:10 +0000 (23:29 +0000)]
Merge "Fix a 'memory leak'"
Lucas Dupin [Tue, 5 Jun 2018 23:15:00 +0000 (23:15 +0000)]
Merge "Whitelist always-on setting"
Ruchi Kandoi [Tue, 5 Jun 2018 23:14:32 +0000 (16:14 -0700)]
Merge "Suppress AID log on adb logcat"
am:
e72aecb655
Change-Id: Ib2acf51fbaf4d1c23d0629a0b8538f3fdb6d313a
Dianne Hackborn [Tue, 5 Jun 2018 23:14:13 +0000 (23:14 +0000)]
Merge "Fix issue #
109746350: startWatchingMode fails on P" into pi-dev
Ying Zheng [Tue, 5 Jun 2018 22:58:31 +0000 (22:58 +0000)]
Merge "Fix a calling loop for getAllUsers." into pi-dev
TreeHugger Robot [Tue, 5 Jun 2018 22:55:44 +0000 (22:55 +0000)]
Merge "Delay pruning direct share targets." into pi-dev
Atanas Kirilov [Tue, 5 Jun 2018 22:38:16 +0000 (15:38 -0700)]
Merge changes from topic "am-
f5dc500e-4d32-4849-891e-
c618cef666de" into oc-dev am:
c3b4881ea5
am:
4f74605d11
Change-Id: Id25fb236775c0055f6d9d32b9c67aab5c9acf570
Wale Ogunwale [Tue, 5 Jun 2018 22:28:03 +0000 (22:28 +0000)]
Merge "Revert "Enable WM.DEBUG_WALLPAPER_LIGHT logs"" into pi-dev
Felipe Leme [Tue, 5 Jun 2018 22:14:21 +0000 (15:14 -0700)]
Log FIELD_AUTOFILL_SESSION_ID as string.
Test: adb shell logcat -b events | grep 1456 # Example:
06-05 22:20:19.760 15733 16200 I sysui_multi_action: [757,906,758,4,806,com.example.android.autofill.app,871,com.example.android.autofill.app.commoncases.StandardSignInActivity,908,com.example.android.autofill.service,1452,0,1456,
2033624394]
Fixes:
80093094
Change-Id: I784fa5549193e0bae0ed453b21d3d2c8fb01035c
Aurimas Liutikas [Mon, 4 Jun 2018 22:35:31 +0000 (15:35 -0700)]
Fix broken links in @see tags in framework docs.
doclava was accidentally suppressing all these broken links
in @see tags. This CL fixes issues so we can start enfocing
checks for broken @see links.
Test: make docs
Bug:
80589960
Change-Id: I9c56841d9af111cb72e9a309bbe1bdcd31c80553
Svet Ganov [Tue, 5 Jun 2018 21:41:20 +0000 (14:41 -0700)]
Don't access keyguard from instant apps. am:
e5a3125c1c
am:
54f78810cc
Change-Id: I916c50f5e0c27a17b1e7dc284b5544b920fc20e8
Svet Ganov [Tue, 5 Jun 2018 21:34:22 +0000 (14:34 -0700)]
Don't access keyguard from instant apps.
am:
e5a3125c1c
Change-Id: I1a6574d771f3e94727d85d24eb5f1abe1a0f388d
Tor Norbye [Tue, 5 Jun 2018 21:33:06 +0000 (21:33 +0000)]
Merge "Add typedef for the Log level"
Atanas Kirilov [Tue, 5 Jun 2018 21:24:30 +0000 (14:24 -0700)]
Merge changes from topic "am-
f5dc500e-4d32-4849-891e-
c618cef666de" into oc-dev
am:
c3b4881ea5
Change-Id: Ia58465b88ef5334753094719f4fdbb175b423f24
Bookatz [Tue, 5 Jun 2018 21:10:59 +0000 (14:10 -0700)]
[automerger skipped] Wean statsd off batterystats: workchain (cp)
am:
0bd972083a -s ours
Change-Id: I9addc450bf92c706b0e2e0d6a14e3b6c0426fd0b
Sean Kelley [Tue, 5 Jun 2018 20:56:58 +0000 (20:56 +0000)]
Merge "Add EXTRA_SKIP_CALL_FILTERING PhoneAccount extra"
Ruchi Kandoi [Tue, 5 Jun 2018 20:56:35 +0000 (20:56 +0000)]
Merge "Suppress AID log on adb logcat"
Svet Ganov [Tue, 5 Jun 2018 01:18:34 +0000 (18:18 -0700)]
Don't access keyguard from instant apps.
Test: manual
bug:
109652548
Change-Id: Ife1302e39e4f71f66d032619068a7e0214856b32
Dianne Hackborn [Tue, 5 Jun 2018 20:21:16 +0000 (13:21 -0700)]
Fix issue #
109746350: startWatchingMode fails on P
Remove permission check, reverting to O behavior.
Bug:
109746350
Test: manual
Change-Id: I643321d508abc5fac5df83f4df3605ad8252e378
TreeHugger Robot [Tue, 5 Jun 2018 19:57:10 +0000 (19:57 +0000)]
Merge "Wean Statsd off BatteryStats: Network Power"
Bookatz [Tue, 5 Jun 2018 19:42:37 +0000 (12:42 -0700)]
Wean statsd off batterystats: workchain (cp)
Modified cherry pick from master:
(cherry picked from commit
d888df2ba99e117b50a5553e18426ad370294a20)
covering ag/
4210168 and ag/
4230692.
The tool that generates StatsLogInternal.java now includes the following
type of code, to accomodate WorkSources automatically.
public static void write(int code, WorkSource ws, int arg2) {
for (int i = 0; i < ws.size(); ++i) {
write_non_chained(code, ws.get(i), ws.getName(i), arg2);
}
ArrayList<WorkSource.WorkChain> workChains = ws.getWorkChains();
if (workChains != null) {
for (WorkSource.WorkChain wc : workChains) {
write(code, wc.getUids(), wc.getTags(), arg2);
}
}
}
This will reduce a lot of code repitition for the StatsLog.write calls
in BatteryStats. Consequently, doing so will make it easier to remove
these StatsLog.write calls out of BatteryStats.
Bug:
80308558
Bug:
80314737
Test: manual verification
Test: com.android.internal.os.BatteryStatsTests
Change-Id: Ied537a6195121f16ef49b6bccf58c8c31964909c
Merged-In: Ibd28297345f4ab926dec01a89de0f1bfff9f8871
Bookatz [Thu, 31 May 2018 23:46:45 +0000 (16:46 -0700)]
StatsLog.write javadoc comment improvements
When attribution is present, log lines should use the
StatsLog.write(WorkSource) variation, so the javadoc comments are
updated accordingly.
Bug:
80308558
Bug:
80314737
Test: manual verification of output's comments
Change-Id: I1d1a7972a68ce98b1dbfd62a829a73edfb605684
Atanas Kirilov [Tue, 5 Jun 2018 19:37:52 +0000 (19:37 +0000)]
Merge changes from topic "am-
f5dc500e-4d32-4849-891e-
c618cef666de" into oc-dev
* changes:
[automerger] Make safe label more safe am:
2263da9539 am:
05086b1008 am:
77f449068a am:
46f4563313 am:
6be1d6713f
[automerger] Make safe label more safe am:
2263da9539 am:
05086b1008 am:
77f449068a am:
46f4563313
[automerger] Make safe label more safe am:
2263da9539 am:
05086b1008 am:
77f449068a
[automerger] Make safe label more safe am:
2263da9539 am:
05086b1008
[automerger] Make safe label more safe am:
2263da9539
Make safe label more safe
Dan Sandler [Tue, 5 Jun 2018 02:13:40 +0000 (22:13 -0400)]
Delay pruning direct share targets.
Pruning was intended to remove targets corresponding to
now-missing packages, but in practice causes the list to
briefly disappear any time packages change:
PACKAGE_CHANGED ->
ResolverActivity.rebuildList() ->
ChooserActivity.onListRebuilt() with an empty
ResolverActivity.mDisplayList
In practice package changes happen all the time, so this
jank happens fairly often. (It contributed to b/
67622422 as
well, since all this list rebuilding started animations that
locked out user input.)
This CL removes the old pruning process (comparing targets
against mDisplayList). Instead, we note that mDisplayList
got emptied, and lazily empty our own mServiceTargets once
we start getting responses back from all the services we
just re-queried.
The long-term fix here is to just rebuild all of this stuff.
Test: (1) share from Chrome
(2) toggle the enable state of some random package
to trigger PACKAGE_CHANGED, e.g.
adb shell pm (enable|disable) com.android.egg
(3) watch for jank
Bug:
109676071
Change-Id: Ie9d59b8f4b8cc8343beb40cbad6b8d52e5639082
Lucas Dupin [Tue, 5 Jun 2018 19:02:14 +0000 (12:02 -0700)]
Whitelist always-on setting
Change-Id: I43c70be051f9a02d0d565fbe73b213788902f2ca
Fixes:
75252202
Test: Manually retore settings on another device using setup wizard
Test: atest core/tests/coretests/src/android/provider/SettingsBackupTest.java
Ying Zheng [Tue, 5 Jun 2018 18:47:40 +0000 (11:47 -0700)]
Fix a calling loop for getAllUsers.
Bug:
109698349
Test: Manual
Change-Id: Id5def3c876ccfb390dd91f7cb24ebd43ebdeaef0
Winson Chung [Tue, 5 Jun 2018 18:35:41 +0000 (11:35 -0700)]
Merge "Allow the system recents component to fetch info for user and profiles" into pi-dev am:
f5976be9f4
am:
e5736b6730
Change-Id: I2b14e84e97f6d02e32ff079174adc343af4ab0d2
Winson Chung [Tue, 5 Jun 2018 18:26:53 +0000 (11:26 -0700)]
Merge "Allow the system recents component to fetch info for user and profiles" into pi-dev
am:
f5976be9f4
Change-Id: I30259434bbc33a4184dffd2fc1430caba2ef7ed0
Winson Chung [Tue, 5 Jun 2018 18:12:16 +0000 (18:12 +0000)]
Merge "Allow the system recents component to fetch info for user and profiles" into pi-dev
Akinobu Nakashima [Fri, 1 Jun 2018 07:35:10 +0000 (16:35 +0900)]
Suppress AID log on adb logcat
When NFC event transaction intent is sent,
the device shows AID information on logcat.
But such information should not be shown for security reasons.
Test: Send NFC EventTransaction and check logcat
Bug:
80551185
Change-Id: I8d1f9c1946bb1514e3a6bfa70fff03be4525d6b5
(cherry picked from commit
37e702861579fddfd275143c2421ca53f27cb41c)
Jiyong Park [Tue, 5 Jun 2018 17:58:57 +0000 (10:58 -0700)]
Merge "Fix: vendor public libraries are accessible via System.loadLibrary" into pi-dev am:
c4b6bd34e1
am:
0221eaa392
Change-Id: I20f644dbafb96955e96f22ecef61292ffeae9e7f
Neil Fuller [Tue, 5 Jun 2018 17:52:58 +0000 (17:52 +0000)]
Merge "Minimum viable TimeDetectorService"
Jiyong Park [Tue, 5 Jun 2018 17:51:37 +0000 (10:51 -0700)]
Merge "Fix: vendor public libraries are accessible via System.loadLibrary" into pi-dev
am:
c4b6bd34e1
Change-Id: I585a02298349846c2bedc5617cb342edaadcb9bb
Jiyong Park [Tue, 5 Jun 2018 17:37:24 +0000 (17:37 +0000)]
Merge "Fix: vendor public libraries are accessible via System.loadLibrary" into pi-dev
TreeHugger Robot [Tue, 5 Jun 2018 16:40:19 +0000 (16:40 +0000)]
Merge changes Iebe457a5,If32da8e6
* changes:
Statsd: Add perfprofd call
Statsd: Add perfprofd_config proto
Tor Norbye [Thu, 16 Jul 2015 20:29:33 +0000 (13:29 -0700)]
Add typedef for the Log level
This CL adds an @IntDef specifying the valid constants
that can be supplied as the Log level.
It also removes a documentation reference to a (former?) level
named "SUPPRESS" which doesn't exist.
Test: In lint
Change-Id: I159d687a5c16be76afcd7a3370a5f02025a1aff7
TreeHugger Robot [Tue, 5 Jun 2018 14:18:32 +0000 (14:18 +0000)]
Merge "ScreenDecorations: fix cutout not showing in seascape"
Eran Messeri [Tue, 5 Jun 2018 13:46:20 +0000 (06:46 -0700)]
Merge "Improve KeyChain documentation" into pi-dev am:
843a0cabbf
am:
6779fecdcc
Change-Id: I25447edd4c22c7df4375f88b904d1300555a3836
Nicolas Geoffray [Tue, 5 Jun 2018 13:37:47 +0000 (06:37 -0700)]
Merge "Add camera APIs to light grey." into pi-dev am:
6c26c953e4
am:
bb570f7223
Change-Id: I336b6a140d548ffea06061b1e149132becfa5dc3
Eran Messeri [Tue, 5 Jun 2018 13:34:29 +0000 (06:34 -0700)]
Merge "Improve KeyChain documentation" into pi-dev
am:
843a0cabbf
Change-Id: I85870248f4cfa44f96f351b0a18e5ef5780cbbf6
Nicolas Geoffray [Tue, 5 Jun 2018 13:28:45 +0000 (06:28 -0700)]
Merge "Add camera APIs to light grey." into pi-dev
am:
6c26c953e4
Change-Id: Iecf617354c98c8336920271fb7a0abccaf3a32a7
Jake Wharton [Tue, 5 Jun 2018 13:23:55 +0000 (13:23 +0000)]
Merge "Annotate Log reference parameters and return types."
TreeHugger Robot [Tue, 5 Jun 2018 13:22:28 +0000 (13:22 +0000)]
Merge "Improve KeyChain documentation" into pi-dev
Nicolas Geoffray [Tue, 5 Jun 2018 13:15:24 +0000 (13:15 +0000)]
Merge "Add camera APIs to light grey." into pi-dev
Mihai Popa [Tue, 5 Jun 2018 13:01:59 +0000 (06:01 -0700)]
[automerger skipped] Merge "Optimise the hit test algorithm" into oc-dev am:
6064d8fd4c am:
0348259446 -s ours am:
86c2ef5bde -s ours am:
db63d3b644 -s ours
am:
2fbe751ea5 -s ours
Change-Id: I968aa86473d15afd5c50c30b2acb961b70bec351
Mihai Popa [Tue, 5 Jun 2018 12:48:25 +0000 (05:48 -0700)]
[automerger skipped] Merge "Optimise the hit test algorithm" into oc-dev am:
6064d8fd4c am:
0348259446 -s ours am:
86c2ef5bde -s ours
am:
db63d3b644 -s ours
Change-Id: If3b34a69adddb0149bd26103570b31fb82f4e986
Mihai Popa [Tue, 5 Jun 2018 12:17:27 +0000 (05:17 -0700)]
[automerger skipped] Merge "Optimise the hit test algorithm" into oc-dev am:
6064d8fd4c am:
0348259446 -s ours
am:
86c2ef5bde -s ours
Change-Id: I334cf06de7d1e48eb52710c5844daa2b32b5b07c
Mihai Popa [Tue, 5 Jun 2018 12:10:43 +0000 (05:10 -0700)]
[automerger skipped] Merge "Optimise the hit test algorithm" into oc-mr1-dev am:
bbfee3189d -s ours am:
b6c9be3ac2 -s ours
am:
a6f270d1e3 -s ours
Change-Id: Ibcb53315ed6415847ae1ef254933c5fee4420cc6
Jorim Jaggi [Tue, 5 Jun 2018 11:58:49 +0000 (04:58 -0700)]
Merge "Crashing can not override Keyguard transit" into pi-dev am:
44121059dc
am:
6d79f45783
Change-Id: I6d4daa349f03891fee1901fb5f5ff96096665f42
Mihai Popa [Tue, 5 Jun 2018 11:51:53 +0000 (04:51 -0700)]
[automerger skipped] Merge "Optimise the hit test algorithm" into oc-mr1-dev am:
bbfee3189d -s ours
am:
b6c9be3ac2 -s ours
Change-Id: I3b7d566cd344ac2e3c8baf62bfee879e0fd9761c
Mihai Popa [Tue, 5 Jun 2018 11:51:17 +0000 (04:51 -0700)]
[automerger skipped] Merge "Optimise the hit test algorithm" into oc-dev am:
6064d8fd4c
am:
0348259446 -s ours
Change-Id: I7ddad2c5dd22f31c812683c4a715dc7738605ff9
Jorim Jaggi [Tue, 5 Jun 2018 11:46:46 +0000 (04:46 -0700)]
Merge "Crashing can not override Keyguard transit" into pi-dev
am:
44121059dc
Change-Id: Ieb020e920e1417d501f12bf7b5c2c57437685d9c
Mihai Popa [Tue, 5 Jun 2018 11:39:47 +0000 (04:39 -0700)]
[automerger skipped] Merge "Optimise the hit test algorithm" into pi-dev am:
0192e9a213
am:
32ea362e11 -s ours
Change-Id: Ib221a37ca6319a68c1a7fd0ed3d0be4e08dade7c
Mihai Popa [Tue, 5 Jun 2018 11:39:29 +0000 (04:39 -0700)]
Merge "Optimise the hit test algorithm" into oc-dev
am:
6064d8fd4c
Change-Id: I465c15edb18c3084e6b8cbf1f42c0c2c1ebea4eb
Mihai Popa [Tue, 5 Jun 2018 11:38:11 +0000 (04:38 -0700)]
[automerger skipped] Merge "Optimise the hit test algorithm" into oc-mr1-dev
am:
bbfee3189d -s ours
Change-Id: I46ea8080731ca5cd9690dff3e60953f1b2d7e930
Jorim Jaggi [Tue, 5 Jun 2018 11:32:55 +0000 (11:32 +0000)]
Merge "Crashing can not override Keyguard transit" into pi-dev
OSDN Git Service
