OSDN Git Service
Sungsoo Lim [Fri, 29 Sep 2017 09:22:28 +0000 (09:22 +0000)]
Merge "Make RoutInfo.select() called in app's main thread" into oc-mr1-dev am:
6e326268c1
am:
aee660bb47
Change-Id: Idc830072c057861c9c6498d190a5b4aafaa3f1cb
Sungsoo Lim [Fri, 29 Sep 2017 08:43:07 +0000 (08:43 +0000)]
Merge "Make RoutInfo.select() called in app's main thread" into oc-mr1-dev
am:
6e326268c1
Change-Id: I91a4e5422a92f3e7571a1ffc7fb19d0594f116e2
Jean-Michel Trivi [Fri, 29 Sep 2017 08:39:17 +0000 (08:39 +0000)]
Merge "NotificationPlayer: fix race conditions" into oc-mr1-dev am:
20e1c66a78
am:
407b58aecb
Change-Id: I24f9e05eaa32d8a3ba007a5785e6d48a86a2c9fe
TreeHugger Robot [Fri, 29 Sep 2017 08:15:05 +0000 (08:15 +0000)]
Merge "Make RoutInfo.select() called in app's main thread" into oc-mr1-dev
Hyundo Moon [Fri, 29 Sep 2017 07:41:54 +0000 (07:41 +0000)]
Merge "Prevent system crash when adjusting volume with illegal direction" into oc-mr1-dev am:
ec0fc85a90
am:
8edb57714c
Change-Id: I084b0b5251a0dbc8ebb142a51380ee43a4d15a1c
Jean-Michel Trivi [Fri, 29 Sep 2017 06:44:43 +0000 (06:44 +0000)]
Merge "NotificationPlayer: fix race conditions" into oc-mr1-dev
am:
20e1c66a78
Change-Id: Iba4e88e036b564c8ccbd615beb9ec7b608e7230e
TreeHugger Robot [Fri, 29 Sep 2017 05:35:18 +0000 (05:35 +0000)]
Merge "AAPT2: Cleanup proto classes/methods and add XML serialization"
TreeHugger Robot [Fri, 29 Sep 2017 05:34:50 +0000 (05:34 +0000)]
Merge "NotificationPlayer: fix race conditions" into oc-mr1-dev
Hyundo Moon [Fri, 29 Sep 2017 05:34:20 +0000 (05:34 +0000)]
Merge "Prevent system crash when adjusting volume with illegal direction" into oc-mr1-dev
am:
ec0fc85a90
Change-Id: I68535fbc5a90e49e928c89fa94c2ca970bb8bf78
Sungsoo Lim [Fri, 29 Sep 2017 01:51:20 +0000 (10:51 +0900)]
Make RoutInfo.select() called in app's main thread
Bug:
66995486
Test: passed MediaRouter test
Test: Checked theat IllegalStateException doesn't happen
Change-Id: Idb75998cd7910a430e68ea928d28c9908260d5fc
Hyundo Moon [Fri, 29 Sep 2017 05:12:43 +0000 (05:12 +0000)]
Merge "Prevent system crash when adjusting volume with illegal direction" into oc-mr1-dev
TreeHugger Robot [Fri, 29 Sep 2017 04:46:12 +0000 (04:46 +0000)]
Merge "Check in new protos and constants. Test: Started statsd and verified it outputs data. Also ran statsd tests."
Jaewan Kim [Fri, 29 Sep 2017 04:07:26 +0000 (04:07 +0000)]
Merge "Add multiuser support for enabling notification listener" into oc-mr1-dev am:
e98975db32
am:
e9f85bdb0e
Change-Id: I46dbbcf06d7166959502e6849fd5be8ff900009a
Adam Lesinski [Thu, 28 Sep 2017 22:50:03 +0000 (15:50 -0700)]
AAPT2: Cleanup proto classes/methods and add XML serialization
Test: make aapt2_tests
Change-Id: I01ac2285af6771a683533c033a59ae6cfe875d93
TreeHugger Robot [Fri, 29 Sep 2017 03:05:46 +0000 (03:05 +0000)]
Merge "AAPT2: Cleanup Visitors for XML and Values"
Jaewan Kim [Fri, 29 Sep 2017 02:41:03 +0000 (02:41 +0000)]
Merge "Add multiuser support for enabling notification listener" into oc-mr1-dev
am:
e98975db32
Change-Id: I37a3c63c256dcb69eb75b75bde4d6f97a0b7622b
Jaewan Kim [Fri, 29 Sep 2017 02:28:49 +0000 (02:28 +0000)]
Merge "Add multiuser support for enabling notification listener" into oc-mr1-dev
Svet Ganov [Fri, 29 Sep 2017 01:23:15 +0000 (01:23 +0000)]
Merge "Don't clobber shared libs when updating app info" into oc-mr1-dev am:
4de7ab5cb1
am:
b5ac756015
Change-Id: I425ff226b355597b52b0e2f871cbc419b069f1ee
Winson Chung [Fri, 29 Sep 2017 01:15:26 +0000 (01:15 +0000)]
Merge "Ensure that the thumbnail path is valid even without a thumbnail." into oc-mr1-dev am:
1b8e47aebf
am:
cdd661f5ea
Change-Id: I4975ceba258cda5015a6ee5574f741fe506df959
Yi Jin [Fri, 29 Sep 2017 00:52:18 +0000 (00:52 +0000)]
Merge "Enable Diskstats Section"
Svet Ganov [Fri, 29 Sep 2017 00:17:57 +0000 (00:17 +0000)]
Merge "Don't clobber shared libs when updating app info" into oc-mr1-dev
am:
4de7ab5cb1
Change-Id: I2e50c036193ba30a203fcfe2f46ea9f94b5992ee
Winson Chung [Fri, 29 Sep 2017 00:10:41 +0000 (00:10 +0000)]
Merge "Ensure that the thumbnail path is valid even without a thumbnail." into oc-mr1-dev
am:
1b8e47aebf
Change-Id: I9f08d7cb640f132fa765b899fbfea5d5f2ee3ea4
TreeHugger Robot [Thu, 28 Sep 2017 23:42:16 +0000 (23:42 +0000)]
Merge "Pass padding information to Minikin"
Yi Jin [Thu, 28 Sep 2017 23:03:29 +0000 (23:03 +0000)]
Merge "Enable netstats dump proto"
Andreas Gampe [Thu, 28 Sep 2017 22:50:04 +0000 (22:50 +0000)]
Merge "Frameworks: Move Log holder to be preloaded" am:
7dd3a7d5c0 am:
5f9ba1a2b6 am:
9bd51f6fcd -s ours
am:
b2512c70c1
Change-Id: I8de2170fd32950322b0708072458d019c883cab5
Andreas Gampe [Thu, 28 Sep 2017 22:40:19 +0000 (22:40 +0000)]
Merge "Frameworks: Move Log holder to be preloaded" am:
7dd3a7d5c0 am:
5f9ba1a2b6
am:
9bd51f6fcd -s ours
Change-Id: Id1d92f43557346bbe8a00d5271cbb705eec98a59
TreeHugger Robot [Thu, 28 Sep 2017 22:37:40 +0000 (22:37 +0000)]
Merge "Finish removing ASEC."
TreeHugger Robot [Thu, 28 Sep 2017 22:22:56 +0000 (22:22 +0000)]
Merge "Don't clobber shared libs when updating app info" into oc-mr1-dev
Bill Yi [Thu, 28 Sep 2017 22:17:50 +0000 (22:17 +0000)]
Import translations. DO NOT MERGE am:
47749a01d7 -s ours am:
27d4c36a3d -s ours am:
5f76e0c11d -s ours am:
8271e98237 -s ours am:
cab9e6e443 -s ours
am:
b862d1e754 -s ours
Change-Id: I4ce3a26eb32d82f98e7dcaafbf598d4c3c8724d1
TreeHugger Robot [Thu, 28 Sep 2017 22:13:47 +0000 (22:13 +0000)]
Merge "Ensure that the thumbnail path is valid even without a thumbnail." into oc-mr1-dev
Bill Yi [Thu, 28 Sep 2017 22:04:19 +0000 (22:04 +0000)]
Import translations. DO NOT MERGE am:
47749a01d7 -s ours am:
27d4c36a3d -s ours am:
5f76e0c11d -s ours am:
8271e98237 -s ours
am:
cab9e6e443 -s ours
Change-Id: I98e0b1fb64702bb04a9dd1884ec2036d00a6b9e1
TreeHugger Robot [Thu, 28 Sep 2017 21:57:43 +0000 (21:57 +0000)]
Merge "Remove AppCacheTest."
Michal Karpinski [Thu, 28 Sep 2017 21:45:16 +0000 (21:45 +0000)]
Merge "Switch to use RefactoredBackupManagerService"
Stefan Lafon [Thu, 28 Sep 2017 03:24:15 +0000 (20:24 -0700)]
Check in new protos and constants.
Test: Started statsd and verified it outputs data. Also ran statsd tests.
Change-Id: I2a438b2ddfcb1576e21acb6159bea607fed7caaa
Andreas Gampe [Thu, 28 Sep 2017 21:29:54 +0000 (21:29 +0000)]
Merge "Frameworks: Move Log holder to be preloaded" am:
7dd3a7d5c0
am:
5f9ba1a2b6
Change-Id: I06eee3546daac89c36a8f26bd4c51d8f2e972377
Andreas Gampe [Thu, 28 Sep 2017 21:21:33 +0000 (21:21 +0000)]
Merge "Frameworks: Move Log holder to be preloaded"
am:
7dd3a7d5c0
Change-Id: Ief51fd7b8cdf14c22ded48fde7121d6cca8f243e
TreeHugger Robot [Thu, 28 Sep 2017 21:16:09 +0000 (21:16 +0000)]
Merge "Fix StorageManagerIntegrationTest."
Bill Yi [Thu, 28 Sep 2017 21:13:54 +0000 (21:13 +0000)]
Import translations. DO NOT MERGE am:
47749a01d7 -s ours am:
27d4c36a3d -s ours am:
5f76e0c11d -s ours am:
8271e98237 -s ours am:
9e04764edf -s ours
am:
4b884d5029 -s ours
Change-Id: I441fa759278680c46bb5dcb981ead16714ccdd9a
Roozbeh Pournader [Thu, 28 Sep 2017 19:35:10 +0000 (12:35 -0700)]
Pass padding information to Minikin
We now pass padding information to Minikin's linebreaker through an
expanded LineWidthDelegate that supports returning padding
information.
Bug:
63938206
Test: bit CtsTextTestCases:android.text.cts.StaticLayoutTest
Change-Id: Ic42b771f9303cb73d829f3a30ebf5439f7302e77
Yi Jin [Thu, 28 Sep 2017 01:24:58 +0000 (18:24 -0700)]
Enable Diskstats Section
Bug:
67019205
Test: manually tested in incident_report tool
Change-Id: I291d4b0b0c01385e57c6ad83a12678c0f8d8746b
Adam Lesinski [Thu, 28 Sep 2017 20:34:35 +0000 (13:34 -0700)]
AAPT2: Cleanup Visitors for XML and Values
Test: make aapt2_tests
Change-Id: Ib61f64c155a380115610edeaf2d65e60258a2426
Bill Yi [Thu, 28 Sep 2017 21:00:55 +0000 (21:00 +0000)]
Import translations. DO NOT MERGE am:
47749a01d7 -s ours am:
27d4c36a3d -s ours am:
5f76e0c11d -s ours am:
8271e98237 -s ours
am:
9e04764edf -s ours
Change-Id: If175e739ebd8669952106e860061646003512ac5
Treehugger Robot [Thu, 28 Sep 2017 20:57:35 +0000 (20:57 +0000)]
Merge "Frameworks: Move Log holder to be preloaded"
Yi Jin [Thu, 28 Sep 2017 20:45:12 +0000 (13:45 -0700)]
Enable netstats dump proto
Bug:
67053414
Test: Manually tested on device
Change-Id: I42f01bd398b91dbbc01d953d6cb6a70dea4d9e1f
Bill Yi [Thu, 28 Sep 2017 20:55:17 +0000 (20:55 +0000)]
Import translations. DO NOT MERGE am:
47749a01d7 -s ours am:
27d4c36a3d -s ours am:
5f76e0c11d -s ours
am:
8271e98237 -s ours
Change-Id: I85207c3c0bc518c71682ebe7a07bd7fe2adbd7da
Evan Laird [Thu, 28 Sep 2017 20:53:59 +0000 (20:53 +0000)]
Merge "Use QS context when creating the bluetooth battery indicator" into oc-mr1-dev am:
69e9500606
am:
fa7f4259ab
Change-Id: I5999839e2b228ce2fd8097f771917a2d2f499ba2
Evan Laird [Thu, 28 Sep 2017 20:46:48 +0000 (20:46 +0000)]
Merge "Use QS context when creating the bluetooth battery indicator" into oc-mr1-dev
am:
69e9500606
Change-Id: I55ca66f2cfc3ae91b39548f61825f3647fd88219
Bill Yi [Thu, 28 Sep 2017 20:31:43 +0000 (20:31 +0000)]
Import translations. DO NOT MERGE am:
47749a01d7 -s ours am:
27d4c36a3d -s ours am:
5f76e0c11d -s ours
am:
8271e98237 -s ours
Change-Id: Ifab6a559892ef14e12e1915f540a09a00a0f2fa9
TreeHugger Robot [Thu, 28 Sep 2017 20:26:58 +0000 (20:26 +0000)]
Merge "Use QS context when creating the bluetooth battery indicator" into oc-mr1-dev
Bill Yi [Thu, 28 Sep 2017 20:19:13 +0000 (20:19 +0000)]
Import translations. DO NOT MERGE am:
47749a01d7 -s ours am:
27d4c36a3d -s ours
am:
5f76e0c11d -s ours
Change-Id: I231ba5e0ac321a50cad0de5c496f84665ce8b89e
Bill Yi [Thu, 28 Sep 2017 20:12:05 +0000 (20:12 +0000)]
Import translations. DO NOT MERGE am:
47749a01d7 -s ours
am:
27d4c36a3d -s ours
Change-Id: Ie5b388d1266df622b41aabc29991509e2a0dc94f
Bill Yi [Thu, 28 Sep 2017 20:06:06 +0000 (20:06 +0000)]
Import translations. DO NOT MERGE
am:
47749a01d7 -s ours
Change-Id: I8c9c8f1ef6b35bffc1939fd7313261aa104ffe09
Jeff Sharkey [Thu, 28 Sep 2017 19:40:22 +0000 (13:40 -0600)]
Remove AppCacheTest.
We have much more robust testing of cache behavior (such as behavior
across multiple apps) over in StorageHostTest.testCache() CTS.
Test: none
Bug:
64039580
Change-Id: I43281e016a37b507e9801e2bc2c2f74c2e76cf65
Jeff Sharkey [Thu, 28 Sep 2017 18:58:20 +0000 (12:58 -0600)]
Fix StorageManagerIntegrationTest.
OBB files need to be stored on external storage; we no longer support
globally readable files from private app data.
Test: bit FrameworksCoreTests:android.os.storage.StorageManagerIntegrationTest
Bug:
64039580
Change-Id: I491006b691c76f80466da59b1bd728afaec7ed94
Jean-Michel Trivi [Tue, 5 Sep 2017 18:41:55 +0000 (11:41 -0700)]
NotificationPlayer: fix race conditions
This patch fixes two race conditions that affect the Looper used
to signal the completion of a notification to abandon audio focus
as well as the wakelock used between issuing a playback
command and its actual start. Annotations are added to clarify
which objects are used to synchronize which methods and variables.
Looper for notification playback completion:
Before a notification starts playing, audio focus is requested,
which causes the ducking of media apps. When the notification
completes, audio focus is abandoned. If a new notification is
to be played while one is playing, the current player is
stopped and the Looper on which we expect the MediaPlayer
completion callback is .quit(). But there is a race condition
between the quitting of the current Looper whenever a sound
is started (in startSound()) and when quit when playback
is stopped (command STOP), and when created in
CreationAndCompletionThread.run(). If the Looper is quit
when another notification starts to play, the completion
callback cannot be received, and audio focus will not be
abandoned.
The fix consists in synchronizing all access to mLooper
on mCompletionHandlingLock.
Wakelock:
Initializing and acquiring the wakelock, and releasing it
are done in different threads (client thread vs CmdThread).
There was no memory barrier between the initialization
and release. The fix consists in making all wakelock
operations synchronized on mCmdQueue.
Test: issue multiple notifications that interrupt eachother, verify focus is abandonned (in logs, check "abandonAudioFocus()")
Bug:
65866087
Bug:
64531811
Change-Id: Ie8f4091eaa96bd0bcb732e27423f6e31e76da98e
TreeHugger Robot [Thu, 28 Sep 2017 18:43:56 +0000 (18:43 +0000)]
Merge "Replace stream operation with simple iteration"
Jeffrey Huang [Thu, 28 Sep 2017 18:05:19 +0000 (18:05 +0000)]
Merge "Add metric for adb dialog"
Wale Ogunwale [Thu, 28 Sep 2017 17:37:57 +0000 (17:37 +0000)]
Merge changes from topic "stack-gone"
* changes:
HOME_STACK_ID, ASSISTANT_STACK_ID, and RECENTS_STACK_ID be gone!
Ability to getOrCreateStack by windowingMode/activityType in AM.
Jeff Sharkey [Fri, 22 Sep 2017 01:09:30 +0000 (19:09 -0600)]
Finish removing ASEC.
Awhile back we explicitly blocked any new ASEC installs, with the
expectation that we'd eventually remove the logic entirely. We've
had them disabled for about a week now without incident, so let's
rip out the remaining code.
Test: bit FrameworksCoreTests:android.content.pm.PackageHelperTests
Test: bit FrameworksCoreTests:android.content.pm.PackageManagerTests
Bug:
32913676
Change-Id: I1ecc35487420731f5c4bdf03bca5751548ce51b3
Makoto Onuki [Thu, 28 Sep 2017 17:23:16 +0000 (17:23 +0000)]
Merge "Don't cancel by UID when an app is disabled or uninstalled" am:
36d606c86d am:
2a99cbb96f am:
95c0a8e8aa
am:
83827fc4ea
Change-Id: If72b738a97cf1c2b6d50cb7d171873145267e6d7
Jorim Jaggi [Thu, 28 Sep 2017 17:15:49 +0000 (17:15 +0000)]
Merge "Add API to request light navigation bar in theme" into oc-mr1-dev am:
e1cf112b6c
am:
e25ff3130e -s ours
Change-Id: I89eabfb827eeb5dc59a73f6f79ed6773c3d10729
Winson Chung [Wed, 27 Sep 2017 00:01:10 +0000 (17:01 -0700)]
Ensure that the thumbnail path is valid even without a thumbnail.
- When there is no thumbnail snapshot, an empty sized thumbnail path is
created since thumbnailWidth/Height are zero. Instead, like the parent
class, the path should default to the view width/height in such a case.
Bug:
66938643
Test: Launch PlayMovies video anew, go home, then to overview
Change-Id: I354ff0716ee44149f50ff11fa435161cf466c0cc
Makoto Onuki [Thu, 28 Sep 2017 17:04:14 +0000 (17:04 +0000)]
Merge "Don't cancel by UID when an app is disabled or uninstalled" am:
36d606c86d am:
2a99cbb96f
am:
95c0a8e8aa
Change-Id: Ie5437b33a373225750c4ca6799b2da3233fbb43d
Makoto Onuki [Thu, 28 Sep 2017 16:46:37 +0000 (16:46 +0000)]
Merge "Don't cancel by UID when an app is disabled or uninstalled" am:
36d606c86d
am:
2a99cbb96f
Change-Id: I5f85ecb0b2434836fa1dd4c508d3f24290d19bf3
Bill Yi [Thu, 28 Sep 2017 16:39:55 +0000 (16:39 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
a980312abf -s ours am:
9f05e68ea5 -s ours am:
cafd489390 -s ours" into oc-mr1-dev-plus-aosp
am:
1e7d845552 -s ours
Change-Id: I3a64a9526a983c0c616a760abd00ec1a0f5d7b61
Jorim Jaggi [Thu, 28 Sep 2017 16:38:38 +0000 (16:38 +0000)]
Merge "Add API to request light navigation bar in theme" into oc-mr1-dev
am:
e1cf112b6c
Change-Id: I7646845711ed39ff47269dc3a7a5e93b06c1b8a1
Makoto Onuki [Thu, 28 Sep 2017 16:36:15 +0000 (16:36 +0000)]
Merge "Don't cancel by UID when an app is disabled or uninstalled"
am:
36d606c86d
Change-Id: Ib0a9eb74f7b31a644472631c10d3a0f1604d8033
Bill Yi [Thu, 28 Sep 2017 16:35:26 +0000 (16:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a980312abf -s ours am:
9f05e68ea5 -s ours am:
8a18b56711 -s ours
am:
3ef3191d7f -s ours
Change-Id: Ief7fa00fd8c99ddd794bd93ccc8705ebb4b8fbc9
Android Build Merger (Role) [Thu, 28 Sep 2017 16:30:14 +0000 (16:30 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
a980312abf -s ours am:
9f05e68ea5 -s ours am:
cafd489390 -s ours" into oc-mr1-dev-plus-aosp
Tenghui Zhu [Thu, 28 Sep 2017 16:26:27 +0000 (16:26 +0000)]
Merge "Trigger circular ripple when touched down, instead of up."
Bill Yi [Thu, 28 Sep 2017 16:26:23 +0000 (16:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a980312abf -s ours am:
9f05e68ea5 -s ours
am:
cafd489390 -s ours
Change-Id: I78d02627ec2eabd9315d2aa4996e87fc0358c768
Jorim Jaggi [Thu, 28 Sep 2017 16:25:54 +0000 (16:25 +0000)]
Merge "Add API to request light navigation bar in theme" into oc-mr1-dev
Bill Yi [Thu, 28 Sep 2017 16:25:28 +0000 (16:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a980312abf -s ours am:
9f05e68ea5 -s ours
am:
8a18b56711 -s ours
Change-Id: Ife31a8953c068fd71096d96c2ee306dcfc5d8bd2
Jorim Jaggi [Tue, 26 Sep 2017 15:24:34 +0000 (17:24 +0200)]
Add API to request light navigation bar in theme
Such that splash screens can already have a light navigation bar,
avoiding a janky flash.
Test: CtsSystemUiTestCases
Bug:
66986286
Bug:
63630024
Change-Id: I0b89c58e9fbca08e27a6ec13db5a07f5e030c682
Merged-In: I81b34fefeb336ac2269dc5e6b98cc0b6045cea70
Jorim Jaggi [Thu, 28 Sep 2017 16:20:23 +0000 (16:20 +0000)]
Merge "Add API to request light navigation bar in theme"
Bill Yi [Thu, 28 Sep 2017 16:19:09 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a980312abf -s ours
am:
9f05e68ea5 -s ours
Change-Id: I6de282dbe84110fef47a069ad6cd2dc17e9bea7f
Makoto Onuki [Thu, 28 Sep 2017 16:19:05 +0000 (16:19 +0000)]
Merge "Don't cancel by UID when an app is disabled or uninstalled"
Bill Yi [Thu, 28 Sep 2017 16:18:57 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a980312abf -s ours
am:
9f05e68ea5 -s ours
Change-Id: Iec6173e113757c3edd2f12a7e6f36b1baae6ba89
Petar Šegina [Thu, 28 Sep 2017 16:17:30 +0000 (16:17 +0000)]
Merge "Fix clip expansion amount"
Petar Šegina [Thu, 28 Sep 2017 16:16:47 +0000 (16:16 +0000)]
Merge "Update referenced constant names for Directions"
Petar Šegina [Thu, 28 Sep 2017 16:14:29 +0000 (16:14 +0000)]
Merge "Do not specify the unchecked exception in the method signature"
Bill Yi [Thu, 28 Sep 2017 16:10:47 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
a980312abf -s ours
Change-Id: I59f002be824830c9ab3224c25c9d9d39edca43f1
TreeHugger Robot [Thu, 28 Sep 2017 16:02:01 +0000 (16:02 +0000)]
Merge "Import translations. DO NOT MERGE"
David Pursell [Thu, 28 Sep 2017 16:01:06 +0000 (16:01 +0000)]
Merge "iot bootaction: use libandroidthings types."
TreeHugger Robot [Thu, 28 Sep 2017 15:59:12 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Thu, 28 Sep 2017 15:56:19 +0000 (15:56 +0000)]
Merge "WebView: use proper javadocs"
Andreas Gampe [Wed, 27 Sep 2017 18:57:27 +0000 (11:57 -0700)]
Frameworks: Move Log holder to be preloaded
To avoid issues with late initialization, let the holder be
initialized in the zygote.
(cherry picked from commit
61a3e8c23a7c62c389433113802a0d74f4ab53cf)
Bug:
65927416
Test: m
Merged-In: I6f454df46d4c64d295e1f2510793d5087b74fb74
Change-Id: I6f454df46d4c64d295e1f2510793d5087b74fb74
TreeHugger Robot [Thu, 28 Sep 2017 15:41:27 +0000 (15:41 +0000)]
Merge "Import translations. DO NOT MERGE"
Andreas Gampe [Thu, 28 Sep 2017 15:33:25 +0000 (15:33 +0000)]
Merge "Frameworks: Move Log holder to be preloaded" into oc-mr1-dev am:
1a17bfa25c
am:
fd31b789f9
Change-Id: Ie6e2671e6ecd53e24cf8a2438ce032ecb0af012b
Andreas Gampe [Thu, 28 Sep 2017 15:25:50 +0000 (15:25 +0000)]
Merge "Frameworks: Move Log holder to be preloaded" into oc-mr1-dev
am:
1a17bfa25c
Change-Id: I108472693a5ce73cec529b354e65b1eeed6ee151
TreeHugger Robot [Thu, 28 Sep 2017 15:16:35 +0000 (15:16 +0000)]
Merge "Frameworks: Move Log holder to be preloaded" into oc-mr1-dev
TreeHugger Robot [Thu, 28 Sep 2017 15:15:56 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 28 Sep 2017 14:52:05 +0000 (14:52 +0000)]
Merge "Import translations. DO NOT MERGE"
Michal Karpinski [Wed, 27 Sep 2017 17:16:30 +0000 (18:16 +0100)]
Switch to use RefactoredBackupManagerService
Keeping the legacy BackupManagerService for now, but we'll remove
it in a few weeks if there's no issues noticed.
In case of any problems, this CL can be cleanly reverted as a fallback.
Test: pretty much all we got in store
1) runtest -p com.android.server.backup frameworks-services
2) make gts -j40 && gts-tradefed run gts -m GtsBackupHostTestCases
3) make cts -j40 && cts-tradefed run cts -m CtsBackupTestCases
4) make pts -j40 && pts-tradefed run pts -m PtsBackupHostSideTestCases
5) manual: "adb shell bmgr backupnow --all" and then cloud restore,
D2D scenarios (both as source and target)
Bug:
65823538
Change-Id: I701764995c4fe2611a4941aecb45315aa457658e
Hugo Benichi [Thu, 28 Sep 2017 12:40:44 +0000 (12:40 +0000)]
Merge "Fix NPE in NsdServiceTest" am:
60d5390f7a am:
f9422cc65b am:
a5d620ae92
am:
a838fcfa75
Change-Id: I5a4837078a7506b30497bba1cceb416ab37e82d9
Hugo Benichi [Thu, 28 Sep 2017 12:35:03 +0000 (12:35 +0000)]
Merge "Fix NPE in NsdServiceTest" am:
60d5390f7a am:
f9422cc65b
am:
a5d620ae92
Change-Id: Ieb299771438fe55566b76271815e52d02da799c8
Hugo Benichi [Thu, 28 Sep 2017 12:28:44 +0000 (12:28 +0000)]
Merge "Fix NPE in NsdServiceTest" am:
60d5390f7a
am:
f9422cc65b
Change-Id: I2c88d81081c7994d42eb2715f29233817730201d
Hugo Benichi [Thu, 28 Sep 2017 12:22:34 +0000 (12:22 +0000)]
Merge "Fix NPE in NsdServiceTest"
am:
60d5390f7a
Change-Id: Ic9b7aaec14066d18247cc1efbdc06be1e6a79f29
Hugo Benichi [Thu, 28 Sep 2017 12:13:18 +0000 (12:13 +0000)]
Merge "Fix NPE in NsdServiceTest"
Bill Yi [Thu, 28 Sep 2017 10:46:39 +0000 (03:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I78318e3a6213ef4ec92a409d319d076740914da0
OSDN Git Service
