OSDN Git Service
Suprabh Shukla [Thu, 19 Oct 2017 14:16:25 +0000 (14:16 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba am:
4e61bdb7d3 am:
d1e7db9f4a am:
9ecbe6f6e7 am:
a9e9e83964 am:
f580b0f6a4 am:
2bded32359 am:
7f9454d63d
am:
98e1285133
Change-Id: Ic61a038f2b8477fe6051df3b5cf6e57c0cc9876d
Makoto Onuki [Thu, 19 Oct 2017 14:03:19 +0000 (14:03 +0000)]
Merge "DO NOT MERGE getPinnedShortcuts() shouldn't crash with shortcuts with..." into oc-mr1-dev am:
c63c9f8ae1
am:
6bf6094394 -s ours
Change-Id: Icf96cdd5c9a1ea8fdf9c6dd04a0791a7a347af34
Suprabh Shukla [Thu, 19 Oct 2017 13:59:10 +0000 (13:59 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours am:
28a1dd26e8 -s ours am:
976b873b98 -s ours am:
174d0688cc -s ours am:
93f47a8662 -s ours am:
272c482c2a -s ours" into oc-mr1-dev-plus-aosp
am:
fdde7e4aa9 -s ours
Change-Id: I7e44f829057c125c604b9650defd13066cc1e69a
Suprabh Shukla [Thu, 19 Oct 2017 13:06:54 +0000 (13:06 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours am:
28a1dd26e8 -s ours am:
976b873b98 -s ours am:
174d0688cc -s ours am:
93f47a8662 -s ours am:
272c482c2a -s ours
am:
590e175015 -s ours
Change-Id: I733f3afe3b44c9d44bb2c79d9ab23630129bef19
Suprabh Shukla [Thu, 19 Oct 2017 12:19:19 +0000 (12:19 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours am:
28a1dd26e8 -s ours am:
976b873b98 -s ours am:
174d0688cc -s ours am:
93f47a8662 -s ours am:
beb43df980 -s ours
am:
83dbda2558 -s ours
Change-Id: Iab1b28636ad59295a7185ba04f6999e4fbf95f09
Joachim Sauer [Thu, 19 Oct 2017 11:48:58 +0000 (11:48 +0000)]
Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os"
Mihai Popa [Thu, 19 Oct 2017 10:12:09 +0000 (10:12 +0000)]
Merge "Enable the public TTC index attribute for fonts"
TreeHugger Robot [Thu, 19 Oct 2017 07:01:10 +0000 (07:01 +0000)]
Merge "Annotate threads for some IME handling methods"
TreeHugger Robot [Thu, 19 Oct 2017 05:46:36 +0000 (05:46 +0000)]
Merge "Add missing JavaDoc for IMS.InputMethodImpl"
TreeHugger Robot [Thu, 19 Oct 2017 05:37:55 +0000 (05:37 +0000)]
Merge "No-op code cleanup for IInputMethodWrapper"
TreeHugger Robot [Thu, 19 Oct 2017 05:16:56 +0000 (05:16 +0000)]
Merge "Location & GNSS Measurement Documetation Fixes"
TreeHugger Robot [Thu, 19 Oct 2017 03:58:43 +0000 (03:58 +0000)]
Merge "Fix invisible SurfaceViews"
Yohei Yukawa [Thu, 19 Oct 2017 03:19:53 +0000 (20:19 -0700)]
Annotate threads for some IME handling methods
This is a preparation to work on Bug
36897707.
For instance, the reason why most of IME-related callbacks in
InputMethodService get called on the main thread is because
IInputMethodWrapper keeps forwarding incoming IPCs into the
main looper of the IME process as follows:
InputMethodManagerService (IMMS)
------
-> one-way binder IPCs over IInputMethod
------
-> IInputMethodWrapper (on the binder thread(s))
-> Handler (to dispatch tasks to main thread)
-> InputMethodImpl.* (on the main thread)
-> InputMethodService.* (on the main thread)
By adding explicit annotations such as @BinderThread and @MainThread
in relevant methods, this CL makes that kind of investigation much
easier than before.
Bug:
36897707
Test: compile
Change-Id: I8f9afe9a1986a9fa41fb66fdc64e8f0f67e45c2e
Yohei Yukawa [Thu, 19 Oct 2017 03:19:43 +0000 (20:19 -0700)]
Add missing JavaDoc for IMS.InputMethodImpl
Bug:
36897707
Test: checkbuild
Change-Id: If1f7cfbfe333f30468d551e8a92bba9f987e8a06
Yohei Yukawa [Thu, 19 Oct 2017 03:19:33 +0000 (20:19 -0700)]
No-op code cleanup for IInputMethodWrapper
This CL is a safe and no-op code clean-up, including dead code removal.
There should be no behavior change.
Test: continuous tests
Bug:
36897707
Change-Id: I4a1ad9cb764c7ba82b32e325c4a4b1c8e7296bbf
Suprabh Shukla [Thu, 19 Oct 2017 02:33:18 +0000 (02:33 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba am:
4e61bdb7d3 am:
d1e7db9f4a am:
9ecbe6f6e7 am:
a9e9e83964 am:
f580b0f6a4 am:
2bded32359
am:
7f9454d63d
Change-Id: I4106b6b3a5ffce44afbe2fb0a515222a5fb97d69
Suprabh Shukla [Thu, 19 Oct 2017 02:16:32 +0000 (02:16 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba am:
4e61bdb7d3 am:
d1e7db9f4a am:
9ecbe6f6e7 am:
a9e9e83964 am:
f580b0f6a4
am:
2bded32359
Change-Id: I630b1db9d19f34f6f42601a36a5883e824087287
Suprabh Shukla [Thu, 19 Oct 2017 01:59:51 +0000 (01:59 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba am:
4e61bdb7d3 am:
d1e7db9f4a am:
9ecbe6f6e7 am:
a9e9e83964
am:
f580b0f6a4
Change-Id: Ie647ac50b0d312df13a163005c2a7bbfd8a4a26e
TreeHugger Robot [Thu, 19 Oct 2017 01:46:44 +0000 (01:46 +0000)]
Merge "Add config resource to specify device specific services"
Robert Carr [Thu, 19 Oct 2017 01:46:27 +0000 (18:46 -0700)]
Fix invisible SurfaceViews
Of course OPAQUE != SURFACE_OPAQUE: that would be too easy.
Test: Manual
Bug:
67896876
Change-Id: Ic7aaae42c7de8195c474c39d850f2a07a58ccc9d
Suprabh Shukla [Thu, 19 Oct 2017 01:44:47 +0000 (01:44 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba am:
4e61bdb7d3 am:
d1e7db9f4a am:
9ecbe6f6e7
am:
a9e9e83964
Change-Id: I97ab1af2f24b3773cb879f13d00fb1df0177f3fc
Suprabh Shukla [Thu, 19 Oct 2017 01:30:27 +0000 (01:30 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba am:
4e61bdb7d3 am:
d1e7db9f4a
am:
9ecbe6f6e7
Change-Id: I6c55e7667d23c638f16bd4bd5c62f9f706542154
TreeHugger Robot [Thu, 19 Oct 2017 01:26:11 +0000 (01:26 +0000)]
Merge "Exempting tempwhitelist apps from doze"
Suprabh Shukla [Thu, 19 Oct 2017 01:18:27 +0000 (01:18 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba am:
4e61bdb7d3
am:
d1e7db9f4a
Change-Id: Ia7824e38f4b5d92d09577e30a20a72bdf513534f
TreeHugger Robot [Thu, 19 Oct 2017 01:16:22 +0000 (01:16 +0000)]
Merge "Modifies error message when making Hub requests"
Suprabh Shukla [Thu, 19 Oct 2017 01:07:40 +0000 (01:07 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba
am:
4e61bdb7d3
Change-Id: I6baddf0fcdcdd5a1236f69f5b19c67aa1e35b3c2
Selim Gurun [Thu, 19 Oct 2017 01:06:39 +0000 (01:06 +0000)]
Merge "Add SystemApis annotations"
Suprabh Shukla [Thu, 19 Oct 2017 00:57:00 +0000 (00:57 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da
am:
f0d00e51ba
Change-Id: I4e775fd5b0c2ad74e92ef84ac1b1e2f307d6b54e
TreeHugger Robot [Thu, 19 Oct 2017 00:51:32 +0000 (00:51 +0000)]
Merge "New Autofill API: CustomDescription.batchUpdates()"
Suprabh Shukla [Thu, 19 Oct 2017 00:47:30 +0000 (00:47 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c
am:
cf16ef09da
Change-Id: I82ed951a2f528dab65b95332db48a865b3fe9296
Suprabh Shukla [Thu, 19 Oct 2017 00:37:28 +0000 (00:37 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958
am:
57bbf9bb9c
Change-Id: Ia3f528efeaca69830c1a858e6c4637690c70062a
Suprabh Shukla [Thu, 19 Oct 2017 00:28:13 +0000 (00:28 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2
am:
2d194e5958
Change-Id: I669966eb694623fe3052db84dd1dc6375e1bfde9
Fyodor Kupolov [Thu, 19 Oct 2017 00:27:33 +0000 (00:27 +0000)]
Merge "Allow creating CursorWindow of custom size"
Suprabh Shukla [Thu, 19 Oct 2017 00:18:17 +0000 (00:18 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours
am:
d2455f8fa2
Change-Id: I20c7da32465a525b0a0bcd21f862a0a49cf727cb
Yi Jin [Thu, 19 Oct 2017 00:16:54 +0000 (00:16 +0000)]
Merge "Fixed several bugs found for incidentd"
Makoto Onuki [Thu, 19 Oct 2017 00:09:46 +0000 (00:09 +0000)]
Merge "DO NOT MERGE getPinnedShortcuts() shouldn't crash with shortcuts with..." into oc-mr1-dev
am:
c63c9f8ae1
Change-Id: Ib006982c87cc4378c697e213504adc05cf2c0658
Suprabh Shukla [Thu, 19 Oct 2017 00:07:54 +0000 (00:07 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448
am:
0597a93629 -s ours
Change-Id: I08d261935eb00ae8e8a929ff9ab54f6ec48fac88
TreeHugger Robot [Wed, 18 Oct 2017 23:56:55 +0000 (23:56 +0000)]
Merge "DO NOT MERGE getPinnedShortcuts() shouldn't crash with shortcuts with..." into oc-mr1-dev
Joe Onorato [Wed, 18 Oct 2017 23:24:41 +0000 (23:24 +0000)]
Merge "Introduce a new wrapper for log_msg -- LogEvent"
TreeHugger Robot [Wed, 18 Oct 2017 22:58:44 +0000 (22:58 +0000)]
Merge "Fix NPE when getting managed profile info."
Makoto Onuki [Wed, 18 Oct 2017 19:52:45 +0000 (12:52 -0700)]
DO NOT MERGE getPinnedShortcuts() shouldn't crash with shortcuts with...
... no activities.
Bug
67931644
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutManagerTestCases
Change-Id: Icea651cf7880c5389467285e9cae3a52c4993669
Wyatt Riley [Fri, 6 Oct 2017 19:57:04 +0000 (12:57 -0700)]
Location & GNSS Measurement Documetation Fixes
Clarifying documenation of SNR, Vertical Accuracy, and
Accumulated Delta Range.
Change-Id: I2684c57e0f4aff2925549e01cbe4f546910f93e0
Fixes:
65369254
Test: Builds (comments only)
Android Build Merger (Role) [Wed, 18 Oct 2017 22:07:33 +0000 (22:07 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours am:
28a1dd26e8 -s ours am:
976b873b98 -s ours am:
174d0688cc -s ours am:
93f47a8662 -s ours am:
272c482c2a -s ours" into oc-mr1-dev-plus-aosp
Suprabh Shukla [Sat, 14 Oct 2017 02:29:36 +0000 (19:29 -0700)]
Exempting tempwhitelist apps from doze
Adding doze exemptions for apps on the tempwhitelist. Any app on the
temporary whitelist can schedule jobs that will be exempt from doze
restrictions as long as the app is in the whitelist.
Test: cts-tradefed run cts-dev -m JobScheduler -t \
android.jobscheduler.cts.TempWhitelistTest
Bug:
64071030
Change-Id: I3846565d927014e73fd1badd34a57226cc788ef3
Suprabh Shukla [Wed, 18 Oct 2017 22:04:26 +0000 (22:04 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours am:
28a1dd26e8 -s ours am:
976b873b98 -s ours am:
174d0688cc -s ours am:
93f47a8662 -s ours
am:
272c482c2a -s ours
Change-Id: I605ca23c70c9c72f9cd06182fe9bddfe3f1375cc
Suprabh Shukla [Wed, 18 Oct 2017 21:53:30 +0000 (21:53 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours am:
28a1dd26e8 -s ours am:
976b873b98 -s ours am:
174d0688cc -s ours am:
93f47a8662 -s ours
am:
beb43df980 -s ours
Change-Id: Ide13b073268906d38aaa70605836f8133468d357
Suprabh Shukla [Wed, 18 Oct 2017 21:28:46 +0000 (21:28 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours am:
28a1dd26e8 -s ours am:
976b873b98 -s ours am:
174d0688cc -s ours
am:
93f47a8662 -s ours
Change-Id: Icfdde90e4e98169ce4dbbc145b9422cd5a1787dc
Suprabh Shukla [Wed, 18 Oct 2017 21:28:40 +0000 (21:28 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours am:
28a1dd26e8 -s ours am:
976b873b98 -s ours am:
174d0688cc -s ours
am:
93f47a8662 -s ours
Change-Id: I6acd44dfe291b529fd5388aeae3cfbb32e3a5c36
TreeHugger Robot [Wed, 18 Oct 2017 21:13:33 +0000 (21:13 +0000)]
Merge "ZenModeConfig XML no longer stores alarms twice."
Suprabh Shukla [Wed, 18 Oct 2017 21:06:57 +0000 (21:06 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours am:
28a1dd26e8 -s ours am:
976b873b98 -s ours
am:
174d0688cc -s ours
Change-Id: Ia0a5c8824afc1bb32179a8770386a84ba60a9034
Winson Chung [Wed, 18 Oct 2017 20:49:42 +0000 (13:49 -0700)]
Fix NPE when getting managed profile info.
- There can be a race condition where the cached profile user ids
aren't yet updated but the actual user has already been removed.
Ignore these users when computing the quiet profile users.
Bug:
67932220
Test: Add/remove a work profile and launch an app
Change-Id: I8888d30e431ca4ffdacc28cc15a80a2deaa23d10
Suprabh Shukla [Wed, 18 Oct 2017 20:34:12 +0000 (20:34 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours am:
28a1dd26e8 -s ours
am:
976b873b98 -s ours
Change-Id: Idc5e6178ac016e8047e34b98249eefb63dcf830c
Suprabh Shukla [Wed, 18 Oct 2017 20:19:08 +0000 (20:19 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours
am:
28a1dd26e8 -s ours
Change-Id: If444060396d2b80c4073ac2c9fd2c4dcb1129590
Yi Jin [Mon, 16 Oct 2017 21:42:50 +0000 (14:42 -0700)]
Fixed several bugs found for incidentd
1. Add logging for proto can't be parsed by incident_report
2. Close opened file descriptor of incident report request!
3. Fix invalid syntax of auto-gen section_list.cpp
Bug:
67849582
Test: manually run incident and checks /proc/<its pid>/fd
Change-Id: I38e6ac28de09aca6243ad536ed41d8059e08ba24
Suprabh Shukla [Wed, 18 Oct 2017 20:05:12 +0000 (20:05 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours
am:
9913314caf -s ours
Change-Id: I5acc3db78fd84503b35aaa61539b1c6922e64465
Tom Cherry [Wed, 18 Oct 2017 19:55:19 +0000 (19:55 +0000)]
Merge "Allow ro. properties to have arbitrary lengths" am:
3851f132d1 am:
9fba6c2fe1 am:
918a29c88d
am:
3fb7276115
Change-Id: I7bc3e26d70267add40bfc2fb09b69b475e4daec6
Tom Cherry [Wed, 18 Oct 2017 19:44:54 +0000 (19:44 +0000)]
Merge "Allow ro. properties to have arbitrary lengths" am:
3851f132d1 am:
9fba6c2fe1
am:
918a29c88d
Change-Id: I29e0ca8d91d29431b498788b548fd48e85d6669b
Suprabh Shukla [Wed, 18 Oct 2017 19:43:57 +0000 (19:43 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours
am:
f0f1b1fe9e -s ours
Change-Id: I8ecb93fa4fa973ea6ee4694e1cd458b353a44bac
Beverly [Wed, 18 Oct 2017 19:36:43 +0000 (15:36 -0400)]
ZenModeConfig XML no longer stores alarms twice.
Test: manual
Change-Id: Ib1824c4a5950e3cffeae0669bfdd17672dfa10a7
Fixes:
67929980
Wale Ogunwale [Wed, 18 Oct 2017 19:18:46 +0000 (19:18 +0000)]
Merge "Don't defer client hidden if activity is already paused" into oc-mr1-dev am:
b3a8950183
am:
36276fd6ee -s ours
Change-Id: I8a04854f153979490d3db693687a2736b6cf8bc7
Suprabh Shukla [Wed, 18 Oct 2017 19:17:53 +0000 (19:17 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours
am:
17f0e4bc00 -s ours
Change-Id: I6dafcb8d51f40d157c2d6efbb41012d19c7eb1d2
Suprabh Shukla [Wed, 18 Oct 2017 19:05:08 +0000 (19:05 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours
am:
62dbcc9af0 -s ours
Change-Id: Ica4728bb090b2653d47308848ef8f771154879ca
Suprabh Shukla [Wed, 18 Oct 2017 18:51:00 +0000 (18:51 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours
am:
88f4c765a6 -s ours
Change-Id: Ia620503c958f9b1b2f44f2e99ba47d36bb558e0f
Tom Cherry [Wed, 18 Oct 2017 18:48:55 +0000 (18:48 +0000)]
Merge "Allow ro. properties to have arbitrary lengths" am:
3851f132d1
am:
9fba6c2fe1
Change-Id: I17743afca87569e5ef6e17572aec0e8e8e535847
Tom Cherry [Wed, 18 Oct 2017 18:39:42 +0000 (18:39 +0000)]
Merge "Allow ro. properties to have arbitrary lengths"
am:
3851f132d1
Change-Id: Ie9c340401786d97e469e283418cffef6fbbbb186
Suprabh Shukla [Wed, 18 Oct 2017 18:36:52 +0000 (18:36 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours
am:
54cbf03ecb -s ours
Change-Id: I500740d20bb4ee1b9cdb2de29387377e02be5872
Android Build Merger (Role) [Wed, 18 Oct 2017 18:26:27 +0000 (18:26 +0000)]
Merge "Merge "Add crash recovery logic to HardwarePropertiesManagerService" into oc-mr1-dev am:
2c25615224 am:
f8084a33b4"
Karthik Ravi Shankar [Wed, 18 Oct 2017 18:24:20 +0000 (18:24 +0000)]
Merge "Add crash recovery logic to HardwarePropertiesManagerService" into oc-mr1-dev am:
2c25615224
am:
f8084a33b4
Change-Id: I4ff5f1b208a246e0d750f3f4871096463ea1db74
Chen Xu [Wed, 18 Oct 2017 18:22:30 +0000 (18:22 +0000)]
Merge "reword title of CS rejection notification"
Tom Cherry [Wed, 18 Oct 2017 18:21:10 +0000 (18:21 +0000)]
Merge "Allow ro. properties to have arbitrary lengths"
Suprabh Shukla [Wed, 18 Oct 2017 18:19:39 +0000 (18:19 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours
am:
5bd2c48ac0 -s ours
Change-Id: Ib09d2326565a43d3ff0c4d0a88041703658a8804
Wale Ogunwale [Wed, 18 Oct 2017 18:16:41 +0000 (18:16 +0000)]
Merge "Don't defer client hidden if activity is already paused" into oc-mr1-dev
am:
b3a8950183
Change-Id: I594079cd01aedb6f14cb534d43b8c0820a63c442
Karthik Ravi Shankar [Wed, 18 Oct 2017 18:09:08 +0000 (18:09 +0000)]
Merge "Add crash recovery logic to HardwarePropertiesManagerService" into oc-mr1-dev
am:
2c25615224
Change-Id: I251edb32e216129d6cb1a1ad2b29f22505cb420a
Suprabh Shukla [Wed, 18 Oct 2017 18:04:15 +0000 (18:04 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f
am:
53a2e46036 -s ours
Change-Id: Ic0fa17750a252a75912c4a2da73d45ff9a9fea1d
TreeHugger Robot [Wed, 18 Oct 2017 17:42:05 +0000 (17:42 +0000)]
Merge "Don't defer client hidden if activity is already paused" into oc-mr1-dev
Karthik Ravi Shankar [Wed, 18 Oct 2017 16:56:05 +0000 (16:56 +0000)]
Merge "Add crash recovery logic to HardwarePropertiesManagerService" into oc-mr1-dev
Tom Cherry [Wed, 18 Oct 2017 16:25:17 +0000 (09:25 -0700)]
Allow ro. properties to have arbitrary lengths
Bug:
23102347
Bug:
34954705
Test: build
Change-Id: I99b074633c60e95cdd2284bf8a708b9187c1e310
Fyodor Kupolov [Wed, 18 Oct 2017 16:23:48 +0000 (16:23 +0000)]
Merge "Report time to unlock users"
Arthur Ishiguro [Wed, 18 Oct 2017 16:13:08 +0000 (09:13 -0700)]
Modifies error message when making Hub requests
Making the debug msg more clear since it could be useful in cases where
something goes wrong in making requests to the Context Hub. While things
will be refactored later, but this is a simple change that could save
some debug time in the meantime.
Bug:
67734082
Test: Compile only
Change-Id: I155b135a1d52f9402db41659740cabb936a1da0d
Android Build Merger (Role) [Wed, 18 Oct 2017 15:16:52 +0000 (15:16 +0000)]
Merge "Merge "Fix incorrect colors for CustomTile in QS" into oc-mr1-dev am:
859f8c4a21 am:
e5d55d52b6"
Evan Laird [Wed, 18 Oct 2017 15:13:54 +0000 (15:13 +0000)]
Merge "Fix incorrect colors for CustomTile in QS" into oc-mr1-dev am:
859f8c4a21
am:
e5d55d52b6
Change-Id: I7ab8bd9a58a7582286e73f1888b81d4a745eac24
TreeHugger Robot [Wed, 18 Oct 2017 15:08:27 +0000 (15:08 +0000)]
Merge "Sync of SmartSelection.java wrapper from Google3 to support the new annotate call, and alternative ways of construction."
Evan Laird [Wed, 18 Oct 2017 14:15:04 +0000 (14:15 +0000)]
Merge "Fix incorrect colors for CustomTile in QS" into oc-mr1-dev
am:
859f8c4a21
Change-Id: Id96f0a18c77628d63069ed434f5904936cb41359
Beverly Tai [Wed, 18 Oct 2017 13:34:28 +0000 (13:34 +0000)]
Merge "Default zen rules updated."
TreeHugger Robot [Wed, 18 Oct 2017 13:20:43 +0000 (13:20 +0000)]
Merge "Fix incorrect colors for CustomTile in QS" into oc-mr1-dev
Joe Onorato [Wed, 18 Oct 2017 06:38:21 +0000 (23:38 -0700)]
Introduce a new wrapper for log_msg -- LogEvent
It stores all of the parsed fields in a single vector, and
provides accessor methods to get at fields by index with
their correct type.
Test: statsd_test
Change-Id: I4fa94e4ce52db3ac87f19b62f9c85398de6e8145
Joe Onorato [Mon, 16 Oct 2017 03:08:52 +0000 (20:08 -0700)]
Clean up how we handle configurations, and other assorted cleanup
- Add a ConfigManager class that tracks the configurations
that have been passed to us. Configurations are now
tracked by tuples of (uid,tag), where the tag is an
app-defined string, in case a single uid has multiple
configurations.
- Move all of the initialization into StatsService.
- Get rid of the ability to have multiple LogListeners. Raw
events are now pushed directly into StatsService, which
can distribute them to the interested parties (and will
eventually be able to do the proper locking).
- Add Log.h, which sets our LOG_TAG correctly.
- Move some of the related files that I expect will grow some
into their own subdirectories.
Test: statsd_test
Test: adb shell cmd stats config ...
Test: adb shell dumpsys stats
Change-Id: I79487603003d8a842d5bd319741f1ecbf72063d1
Lukas Zilka [Wed, 18 Oct 2017 09:39:13 +0000 (11:39 +0200)]
Sync of SmartSelection.java wrapper from Google3 to support the new annotate call, and alternative ways of construction.
Bug:
67618889
Test: Builds. Works in Google3.
Change-Id: I3b67235c969178966c784d13a091ca404d598488
Tobias Thierer [Tue, 17 Oct 2017 19:26:20 +0000 (20:26 +0100)]
Framework: Prefer android.system.Os over libcore.io.Libcore.os
This is a pure refactoring with no a behavior change other than
that these calls now go through android.system.Os, which immediately
delegates to Libcore.os.
This is a first step towards separating framework (via
android.system.Os) vs. libcore (via Libcore.os) clients of these
low level APIs. Separating these is a prerequisite towards moving
the API parts of android.system into framework, and moving the
rest into a different package in libcore.
Test: Treehugger
Bug:
67901714
Change-Id: Ifd8349ec5416e5693f40dba48fdf2bef651b7d81
Dan Willemsen [Wed, 18 Oct 2017 06:33:44 +0000 (06:33 +0000)]
Merge "Use soong_ui directly, instead of make" am:
e994b4b584 am:
0531e5c647 am:
98fc198f1f
am:
bfc9e71e0d
Change-Id: I5ef2f58b01632438702ac3bebb19b61000016dfe
Dan Willemsen [Wed, 18 Oct 2017 06:24:45 +0000 (06:24 +0000)]
Merge "Use soong_ui directly, instead of make" am:
e994b4b584 am:
0531e5c647
am:
98fc198f1f
Change-Id: Id17adee4b02cc499261f88c3faed15d889f5b6c3
Dan Willemsen [Wed, 18 Oct 2017 06:17:09 +0000 (06:17 +0000)]
Merge "Use soong_ui directly, instead of make" am:
e994b4b584
am:
0531e5c647
Change-Id: Ic3fc61824852181512f941dbc57c158540546616
Dan Willemsen [Wed, 18 Oct 2017 06:10:06 +0000 (06:10 +0000)]
Merge "Use soong_ui directly, instead of make"
am:
e994b4b584
Change-Id: I406a02af2d5fd1accf5c53609af00f416669e18f
Dan Willemsen [Wed, 18 Oct 2017 06:00:51 +0000 (06:00 +0000)]
Merge "Use soong_ui directly, instead of make"
Terry (Woncheol) Heo [Wed, 18 Oct 2017 04:39:53 +0000 (04:39 +0000)]
Merge "Fix loading of the default animation settings"
TreeHugger Robot [Wed, 18 Oct 2017 03:02:44 +0000 (03:02 +0000)]
Merge "Added perf test to measure bytes written"
TreeHugger Robot [Wed, 18 Oct 2017 01:59:07 +0000 (01:59 +0000)]
Merge "Relax checks on dynamic permissions."
Adam Lesinski [Wed, 18 Oct 2017 01:27:03 +0000 (01:27 +0000)]
Merge "AAPT2: Flatten AndroidManifest.xml stringpool in UTF16" into oc-mr1-dev am:
3bdfe1a251
am:
f60d30b682
Change-Id: Ic03aa3e7991b01a8ed93732ae8280e832ee6758a
TreeHugger Robot [Wed, 18 Oct 2017 01:21:09 +0000 (01:21 +0000)]
Merge "Minor logging improvements on Autofill."
TreeHugger Robot [Wed, 18 Oct 2017 01:09:37 +0000 (01:09 +0000)]
Merge "Fixes retrieving fullscreen stack when recents is not available yet"
OSDN Git Service
