OSDN Git Service
Dan Sandler [Sat, 12 Aug 2017 04:03:13 +0000 (04:03 +0000)]
Merge "Move USE_COLORIZED_NOTIFICATIONS to com.android. am:
708a1ca16a -s ours" into oc-mr1-dev am:
968f7787e0 -s ours
am:
79fa041762 -s ours
Change-Id: I015a3ef63c421f85c928c2f5f04c77c1485bd750
Makoto Onuki [Sat, 12 Aug 2017 03:58:04 +0000 (03:58 +0000)]
Merge "Merge "Merge "WTF when device has no persistent periodic syncs..." into oc-dr1-dev am:
7b0dec4142" into oc-dr1-dev-plus-aosp am:
39af219c23" into oc-mr1-dev-plus-aosp
am:
32755985fb
Change-Id: Iad2f1fa7c3ebad8860e8e8459c462cbe54a5589d
Dan Sandler [Sat, 12 Aug 2017 03:52:37 +0000 (03:52 +0000)]
Merge "Move USE_COLORIZED_NOTIFICATIONS to com.android. am:
708a1ca16a -s ours am:
f11a45e036 -s ours" into oc-mr1-dev-plus-aosp
am:
e079655f8c -s ours
Change-Id: I1647c97cdf8a30a15322ccd32d006b9f8ca2cfe5
Steven Moreland [Sat, 12 Aug 2017 03:48:38 +0000 (03:48 +0000)]
Merge "Merge "aapt2_jni: use proper nativehelper headers" into stage-aosp-master am:
e17aa09136 am:
1c7ae6507e am:
5c65590564" into oc-mr1-dev-plus-aosp
am:
a750dce30b
Change-Id: I2ab40e21bdd678c33ae4287bfc693cdd8bb33ed8
Dan Sandler [Sat, 12 Aug 2017 03:43:47 +0000 (03:43 +0000)]
Merge "Move USE_COLORIZED_NOTIFICATIONS to com.android. am:
708a1ca16a -s ours" into oc-mr1-dev
am:
968f7787e0 -s ours
Change-Id: I933b8597b682a72ee3db82ad08b7f930f813f7fa
Android Build Merger (Role) [Sat, 12 Aug 2017 03:42:09 +0000 (03:42 +0000)]
Merge "Merge "Merge "WTF when device has no persistent periodic syncs..." into oc-dr1-dev am:
7b0dec4142" into oc-dr1-dev-plus-aosp am:
39af219c23" into oc-mr1-dev-plus-aosp
Jason Monk [Sat, 12 Aug 2017 03:42:09 +0000 (03:42 +0000)]
Merge "Merge "Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev am:
84626a4e3d" into oc-dr1-dev-plus-aosp am:
4802b828a2" into oc-mr1-dev-plus-aosp
am:
987fb55c2a
Change-Id: Iac7925ce9d03da038be8d7d5acc59c41134add26
Makoto Onuki [Sat, 12 Aug 2017 03:38:30 +0000 (03:38 +0000)]
Merge "Merge "WTF when device has no persistent periodic syncs..." into oc-dr1-dev am:
7b0dec4142" into oc-dr1-dev-plus-aosp
am:
39af219c23
Change-Id: Ie1f21a25f5ec12e84a95c62f12396cd3c9ec282e
Android Build Merger (Role) [Sat, 12 Aug 2017 03:38:03 +0000 (03:38 +0000)]
Merge "Move USE_COLORIZED_NOTIFICATIONS to com.android. am:
708a1ca16a -s ours am:
f11a45e036 -s ours" into oc-mr1-dev-plus-aosp
Jeff Sharkey [Sat, 12 Aug 2017 03:38:00 +0000 (03:38 +0000)]
Merge "Remove a bunch of deprecated @SystemApi." into oc-mr1-dev am:
c2e09129e0
am:
b2a9f55488
Change-Id: Ib7e00ad3b02bf62fad1cc32c9e6002b2b7a45369
Android Build Merger (Role) [Sat, 12 Aug 2017 03:37:42 +0000 (03:37 +0000)]
Merge "Merge "aapt2_jni: use proper nativehelper headers" into stage-aosp-master am:
e17aa09136 am:
1c7ae6507e am:
5c65590564" into oc-mr1-dev-plus-aosp
Dan Sandler [Sat, 12 Aug 2017 03:33:03 +0000 (03:33 +0000)]
Move USE_COLORIZED_NOTIFICATIONS to com.android. am:
708a1ca16a -s ours
am:
f11a45e036 -s ours
Change-Id: I8614de0b6edd7e3da0672cf61c2590922b027146
Steven Moreland [Sat, 12 Aug 2017 03:32:29 +0000 (03:32 +0000)]
Merge "aapt2_jni: use proper nativehelper headers" into stage-aosp-master am:
e17aa09136 am:
1c7ae6507e
am:
5c65590564
Change-Id: Ie3c13f03658a2a5ac8fae7edadb4833b86716386
Android Build Merger (Role) [Sat, 12 Aug 2017 03:32:04 +0000 (03:32 +0000)]
Merge "Merge "Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev am:
84626a4e3d" into oc-dr1-dev-plus-aosp am:
4802b828a2" into oc-mr1-dev-plus-aosp
Jason Monk [Sat, 12 Aug 2017 03:27:43 +0000 (03:27 +0000)]
Merge "Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev am:
84626a4e3d" into oc-dr1-dev-plus-aosp
am:
4802b828a2
Change-Id: I94f7cf72a3dc847f79420ff221467cbd80a88c2e
Jeff Sharkey [Sat, 12 Aug 2017 03:25:49 +0000 (03:25 +0000)]
Merge "Remove a bunch of deprecated @SystemApi." into oc-mr1-dev
am:
c2e09129e0
Change-Id: I26089a2aef16845f2e2935e95810457e287bd0e1
Android Build Merger (Role) [Sat, 12 Aug 2017 03:22:35 +0000 (03:22 +0000)]
Merge "Move USE_COLORIZED_NOTIFICATIONS to com.android. am:
708a1ca16a -s ours" into oc-mr1-dev
Jeff Sharkey [Sat, 12 Aug 2017 03:21:01 +0000 (03:21 +0000)]
Merge "Remove a bunch of deprecated @SystemApi." into oc-mr1-dev
Dan Sandler [Sat, 12 Aug 2017 03:19:18 +0000 (03:19 +0000)]
Move USE_COLORIZED_NOTIFICATIONS to com.android.
am:
708a1ca16a -s ours
Change-Id: Id56b3821e6f0166812da2f75c8d41d7a14a0f814
Dan Sandler [Sat, 12 Aug 2017 00:30:24 +0000 (20:30 -0400)]
Move USE_COLORIZED_NOTIFICATIONS to com.android.
It's @hidden, but CTS needs it to be out of the android.*
namespace too.
Fixes:
64613274
Test: Grab the cts binaries(android-cts.zip) from OC Release
Test: Extract and from android-cts/tools directory, launch ./cts-tradefed
Test: On the DUT with CL cherrypicked, run the below(will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered doesn't fail for android namespace:android.permission.TRIGGER_TIME_ZONE_RULES_CHECK
Change-Id: I753c2cc19111f9ed39e7fc3e006aab096c733ddc
Merged-In: I2046ae17b9e89ac0a83e182b91422fd242bc7557
Jeff Sharkey [Sat, 12 Aug 2017 01:15:43 +0000 (01:15 +0000)]
Merge "Rename API to match StorageStats." into oc-mr1-dev am:
74f7a1425f
am:
6099e1c142
Change-Id: I8241dc312a087cb84e5d51fd6db5aeced5e87a2c
Tomasz Wasilczyk [Sat, 12 Aug 2017 01:10:27 +0000 (01:10 +0000)]
Merge "Implement region guessing." into oc-mr1-dev am:
d4446b79a3
am:
8732db930b
Change-Id: I931a63cef664de12fe2b7d975cbdf0f6c213beab
Jeff Sharkey [Sat, 12 Aug 2017 01:06:28 +0000 (01:06 +0000)]
Merge "Only destroy the storage area that had trouble." into oc-mr1-dev am:
9aa5b26aed
am:
5ccd3466a2
Change-Id: If9763a55ae5890b3a425cf1dc2b6ec01b1029025
Adrian Roos [Sat, 12 Aug 2017 00:48:47 +0000 (00:48 +0000)]
Merge "AOD: Fix navbar flicker when transitioning to AOD" into oc-dr1-dev am:
1cbfe74fc2 am:
63953ef041
am:
4b559a3b69
Change-Id: I7d319fa53fddc2f5386410cda6e8f25fc01f8d1b
Jeff Sharkey [Sat, 12 Aug 2017 00:45:19 +0000 (00:45 +0000)]
Merge "Rename API to match StorageStats." into oc-mr1-dev
am:
74f7a1425f
Change-Id: I87815da4f2f96c476fcdfdb3361d0f43b895e909
Andrii Kulian [Sat, 12 Aug 2017 00:44:56 +0000 (00:44 +0000)]
Merge "Don't animate black background on cold launch from launcher" into oc-dr1-dev am:
cff260adfc am:
4397f03378
am:
02de06d466
Change-Id: Ic2bca6e6dff396c39c9f07cb98c6a9e5086cdd43
Michal Karpinski [Sat, 12 Aug 2017 00:37:31 +0000 (00:37 +0000)]
Merge "Removing non-preferred activity from resolution set should not disrupt the preferred resolution" into oc-mr1-dev am:
0b4b9f9c02
am:
116ae427e6
Change-Id: I7a38ec63bef300e1fb0a6c49d4b9ee9553ec93a0
Tomasz Wasilczyk [Sat, 12 Aug 2017 00:34:41 +0000 (00:34 +0000)]
Merge "Implement region guessing." into oc-mr1-dev
am:
d4446b79a3
Change-Id: I88dcef28618bbd0909a717289a8ebe1bde108e10
Todd Kennedy [Sat, 12 Aug 2017 00:33:25 +0000 (00:33 +0000)]
Merge "@hide new API" into oc-mr1-dev am:
414f1975b1
am:
bfbc6fe472
Change-Id: I43160200a63a40cc0d766756928c4398cf956b67
Shuzhen Wang [Sat, 12 Aug 2017 00:29:10 +0000 (00:29 +0000)]
Merge "Camera2: Legacy: Add onRequestQueueEmpty callback" into oc-mr1-dev am:
4dde010145
am:
7ff3038385
Change-Id: I58077003219ed03ba08e5aab1475f2d46219825f
Jeff Sharkey [Sat, 12 Aug 2017 00:28:33 +0000 (00:28 +0000)]
Merge "Only destroy the storage area that had trouble." into oc-mr1-dev
am:
9aa5b26aed
Change-Id: I18e3a2797321c97e92d9cfd0e09b3c41e2e51683
Makoto Onuki [Sat, 12 Aug 2017 00:25:14 +0000 (00:25 +0000)]
Merge "WTF when device has no persistent periodic syncs..." into oc-dr1-dev am:
7b0dec4142 am:
dd1a866380
am:
e49b2e5c60
Change-Id: Ie61dc214102b83798269dc24d5ee6aede3fbf735
Jason Monk [Sat, 12 Aug 2017 00:18:12 +0000 (00:18 +0000)]
Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev am:
84626a4e3d am:
577e6bebd0
am:
6720da43f9
Change-Id: I93d70a5a32428912017f3643f1fe80dea48fafaa
Adrian Roos [Sat, 12 Aug 2017 00:16:54 +0000 (00:16 +0000)]
Merge "AOD: Fix navbar flicker when transitioning to AOD" into oc-dr1-dev am:
1cbfe74fc2
am:
63953ef041
Change-Id: I847f62c42f0199ef2c5f694d3c4f498ac9f39658
TreeHugger Robot [Sat, 12 Aug 2017 00:16:43 +0000 (00:16 +0000)]
Merge "Rename API to match StorageStats." into oc-mr1-dev
Tomasz Wasilczyk [Sat, 12 Aug 2017 00:16:01 +0000 (00:16 +0000)]
Merge "Implement region guessing." into oc-mr1-dev
Sunny Goyal [Sat, 12 Aug 2017 00:14:04 +0000 (00:14 +0000)]
Merge "Promoting installExistingPackage to SystemApi" into oc-mr1-dev am:
6561f067bb
am:
675ae0a16f
Change-Id: I2306aa572a17ec637bdeca0f98ed4e07eb48622c
Andrii Kulian [Sat, 12 Aug 2017 00:12:29 +0000 (00:12 +0000)]
Merge "Don't animate black background on cold launch from launcher" into oc-dr1-dev am:
cff260adfc
am:
4397f03378
Change-Id: I48560bd983b105d2b37e813d1c3f9fd8bebf006d
TreeHugger Robot [Sat, 12 Aug 2017 00:11:56 +0000 (00:11 +0000)]
Merge "Only destroy the storage area that had trouble." into oc-mr1-dev
Sheng-Hao Tsao [Sat, 12 Aug 2017 00:08:10 +0000 (00:08 +0000)]
Merge "Fix a bug that SurfaceView loses transformation" into oc-mr1-dev am:
e22ecbdd61
am:
8bb38b555b
Change-Id: I700178674fa12d088bdf2b1bb67ea1f12fb33b53
Michal Karpinski [Sat, 12 Aug 2017 00:07:33 +0000 (00:07 +0000)]
Merge "Removing non-preferred activity from resolution set should not disrupt the preferred resolution" into oc-mr1-dev
am:
0b4b9f9c02
Change-Id: I95a5261f45df6d662d0e202d0cfb7e62eee15e82
Cindy Kuang [Sat, 12 Aug 2017 00:03:44 +0000 (00:03 +0000)]
Merge "Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2 am:
f125024688" into oc-mr1-dev am:
4dd37fa9d9
am:
c0faa604db
Change-Id: I2c9dc1abe06572cff3b9a0c1f5a61b360cb86984
Todd Kennedy [Sat, 12 Aug 2017 00:02:46 +0000 (00:02 +0000)]
Merge "@hide new API" into oc-mr1-dev
am:
414f1975b1
Change-Id: Ibf19c48a75a3af41f82817c438d8d67142a52cea
Cindy Kuang [Fri, 11 Aug 2017 23:59:20 +0000 (23:59 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
07f5257b19" into oc-mr1-dev am:
c4913b6499
am:
4e41f88c63
Change-Id: I27797b63053508d13cbc1752324d8e4b4b8f711d
Adrian Roos [Fri, 11 Aug 2017 23:54:50 +0000 (23:54 +0000)]
Merge "AOD: Fix navbar flicker when transitioning to AOD" into oc-dr1-dev
am:
1cbfe74fc2
Change-Id: I6b5c4ce303455e592ecb0e6c6bfcd238fbd8a7ef
Shuzhen Wang [Fri, 11 Aug 2017 23:45:11 +0000 (23:45 +0000)]
Merge "Camera2: Legacy: Add onRequestQueueEmpty callback" into oc-mr1-dev
am:
4dde010145
Change-Id: Ib2ea8e264fbb4a0833b2cae0f62c6485ea6f0613
TreeHugger Robot [Fri, 11 Aug 2017 23:43:11 +0000 (23:43 +0000)]
Merge "AOD: Fix navbar flicker when transitioning to AOD" into oc-dr1-dev
Makoto Onuki [Fri, 11 Aug 2017 23:40:46 +0000 (23:40 +0000)]
Merge "WTF when device has no persistent periodic syncs..." into oc-dr1-dev am:
7b0dec4142
am:
dd1a866380
Change-Id: I8981122d6b9386f57322ed274a2bfae627ab9cb3
Andrii Kulian [Fri, 11 Aug 2017 23:39:59 +0000 (23:39 +0000)]
Merge "Don't animate black background on cold launch from launcher" into oc-dr1-dev
am:
cff260adfc
Change-Id: Iad8a5b4524d70801eeb7b4abb14626b3ae127e32
Android Build Merger (Role) [Fri, 11 Aug 2017 23:38:03 +0000 (23:38 +0000)]
Merge "Merge "Change PiP menu activity title to prevent duplicate announcement." into oc-mr1-dev am:
eb098f2681 am:
5423094a83"
Jason Monk [Fri, 11 Aug 2017 23:36:28 +0000 (23:36 +0000)]
Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev am:
84626a4e3d
am:
577e6bebd0
Change-Id: I108689d8f28eb12453f5da86370de1bfa76f932d
Winson Chung [Fri, 11 Aug 2017 23:32:57 +0000 (23:32 +0000)]
Merge "Change PiP menu activity title to prevent duplicate announcement." into oc-mr1-dev am:
eb098f2681
am:
5423094a83
Change-Id: I972e833a2dd45a5ebc4078c0322a7f1ae88a0120
Android Build Merger (Role) [Fri, 11 Aug 2017 23:31:52 +0000 (23:31 +0000)]
Merge "Merge "Reland: PackageManager: update documentation for FEATURE_WIFI_PASSPOINT" into oc-mr1-dev am:
3df6be7875 am:
de90ca8412"
Andrii Kulian [Fri, 11 Aug 2017 23:31:44 +0000 (23:31 +0000)]
Merge "Don't animate black background on cold launch from launcher" into oc-dr1-dev
Sunny Goyal [Fri, 11 Aug 2017 23:31:29 +0000 (23:31 +0000)]
Merge "Promoting installExistingPackage to SystemApi" into oc-mr1-dev
am:
6561f067bb
Change-Id: If6a3158d88f4ed1590931e0c70efbab3c9115e97
Roozbeh Pournader [Fri, 11 Aug 2017 23:27:50 +0000 (23:27 +0000)]
Merge "Support multiple languages per font in fonts.xml"
Peter Qiu [Fri, 11 Aug 2017 23:27:24 +0000 (23:27 +0000)]
Merge "Reland: PackageManager: update documentation for FEATURE_WIFI_PASSPOINT" into oc-mr1-dev am:
3df6be7875
am:
de90ca8412
Change-Id: Idace7218dc222d6edcebf77861f941a3684a3211
TreeHugger Robot [Fri, 11 Aug 2017 23:27:16 +0000 (23:27 +0000)]
Merge "Removing non-preferred activity from resolution set should not disrupt the preferred resolution" into oc-mr1-dev
Sheng-Hao Tsao [Fri, 11 Aug 2017 23:26:07 +0000 (23:26 +0000)]
Merge "Fix a bug that SurfaceView loses transformation" into oc-mr1-dev
am:
e22ecbdd61
Change-Id: I893e8346ce58b39f1e84a7e38af6a04f11f03800
Calin Juravle [Fri, 11 Aug 2017 23:24:15 +0000 (23:24 +0000)]
Merge "Ensure dexopt is executed only with consistent package data" into oc-mr1-dev am:
5ba8e3dc78
am:
f4f8058c51
Change-Id: I61c9c853b2e3173bff00daa8b2c8d89ddea0bd44
Cindy Kuang [Fri, 11 Aug 2017 23:22:10 +0000 (23:22 +0000)]
Merge "Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2 am:
f125024688" into oc-mr1-dev
am:
4dd37fa9d9
Change-Id: I778ef2fde34db3ff349116500928298d51c7a601
Pankaj Kanwar [Fri, 11 Aug 2017 23:20:50 +0000 (23:20 +0000)]
Merge "Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev am:
bcfa22584b" into oc-mr1-dev am:
149cfd37db
am:
fded73b8a2
Change-Id: If8fd7b6a9387256b6ae0183ba2c74f366aed3a18
TreeHugger Robot [Fri, 11 Aug 2017 23:20:07 +0000 (23:20 +0000)]
Merge "@hide new API" into oc-mr1-dev
Cindy Kuang [Fri, 11 Aug 2017 23:14:01 +0000 (23:14 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
07f5257b19" into oc-mr1-dev
am:
c4913b6499
Change-Id: Ib3a3b75eb027a899474a0ffa14c690575fa7e4f0
Winson Chung [Fri, 11 Aug 2017 23:03:03 +0000 (23:03 +0000)]
Merge "Change PiP menu activity title to prevent duplicate announcement." into oc-mr1-dev
am:
eb098f2681
Change-Id: I77643e24ad7f0052a81c1a8866cacb2d7fff72d9
Michal Karpinski [Fri, 11 Aug 2017 22:53:04 +0000 (22:53 +0000)]
Merge "Merge "Add "Threading" section to BackupAgent's class level javadoc" into oc-mr1-dev am:
5500732584" into oc-mr1-dev-plus-aosp
am:
3e7f323481
Change-Id: I6ab2c9d851ebfe46b7e62753f047ef2976524f6a
TreeHugger Robot [Fri, 11 Aug 2017 22:47:53 +0000 (22:47 +0000)]
Merge "Camera2: Legacy: Add onRequestQueueEmpty callback" into oc-mr1-dev
Cindy Kuang [Fri, 11 Aug 2017 22:38:54 +0000 (22:38 +0000)]
Merge "Merge "Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2 am:
f125024688" into oc-dr1-dev-plus-aosp am:
3ae1e07073" into oc-mr1-dev-plus-aosp
am:
b1ac97e5c1
Change-Id: Idefa605a67d40a4ec2d5f8c242e79acf653cb701
Makoto Onuki [Fri, 11 Aug 2017 22:36:24 +0000 (22:36 +0000)]
Merge "WTF when device has no persistent periodic syncs..." into oc-dr1-dev
am:
7b0dec4142
Change-Id: I5498e5a3796a463501917874772be335785e1ca4
Peter Qiu [Fri, 11 Aug 2017 22:35:10 +0000 (22:35 +0000)]
Merge "Reland: PackageManager: update documentation for FEATURE_WIFI_PASSPOINT" into oc-mr1-dev
am:
3df6be7875
Change-Id: Idc8943172f4540b1c7da47c6da24d5d1eed843a4
Winson Chung [Fri, 11 Aug 2017 22:34:34 +0000 (22:34 +0000)]
Merge "Fixing typo in swipe helper causing views not to be faded when swiped." into oc-mr1-dev am:
35ebb3c535
am:
e1cd325bca
Change-Id: I41d36d3861edb28476ec7123d1ccb3adce3c49e7
Jason Monk [Fri, 11 Aug 2017 22:29:00 +0000 (22:29 +0000)]
Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev
am:
84626a4e3d
Change-Id: I4c3c5be04aaa1eee409ea706b387370cedf5b15b
Steven Moreland [Fri, 11 Aug 2017 22:28:23 +0000 (22:28 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" am:
75c9e4d594 am:
e04a0bf5c7 am:
99cb134bf2 -s ours am:
7c9f93d832 -s ours
am:
d5593e0f19 -s ours
Change-Id: Ieb4c1ef120eca3bab9c561adb1295c8dd9ed39de
Calin Juravle [Fri, 11 Aug 2017 22:23:34 +0000 (22:23 +0000)]
Merge "Ensure dexopt is executed only with consistent package data" into oc-mr1-dev
am:
5ba8e3dc78
Change-Id: I1236a8f4bc1a11abde32e9462aefcba6d88e1854
Pankaj Kanwar [Fri, 11 Aug 2017 22:18:49 +0000 (22:18 +0000)]
Merge "Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev am:
bcfa22584b" into oc-mr1-dev
am:
149cfd37db
Change-Id: I99094f0da0fcb3c995ad777a31a60e4ac826e04e
Android Build Merger (Role) [Fri, 11 Aug 2017 22:13:38 +0000 (22:13 +0000)]
Merge "Merge "Add "Threading" section to BackupAgent's class level javadoc" into oc-mr1-dev am:
5500732584" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 11 Aug 2017 22:13:04 +0000 (22:13 +0000)]
Merge "Merge "WTF when device has no persistent periodic syncs..." into oc-dr1-dev am:
7b0dec4142" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 11 Aug 2017 22:10:37 +0000 (22:10 +0000)]
Merge "Merge "Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2 am:
f125024688" into oc-dr1-dev-plus-aosp am:
3ae1e07073" into oc-mr1-dev-plus-aosp
Michal Karpinski [Fri, 11 Aug 2017 22:09:28 +0000 (22:09 +0000)]
Merge "Add "Threading" section to BackupAgent's class level javadoc" into oc-mr1-dev
am:
5500732584
Change-Id: Ibbe75bff86138dfd0d2b623dffd08610c5b3823e
Makoto Onuki [Fri, 11 Aug 2017 22:08:15 +0000 (22:08 +0000)]
Merge "WTF when device has no persistent periodic syncs..." into oc-dr1-dev
am:
7b0dec4142
Change-Id: Iebb109a246b174b6659abed862909b43ddcce74b
Steven Moreland [Fri, 11 Aug 2017 22:06:57 +0000 (22:06 +0000)]
Merge "aapt2_jni: use proper nativehelper headers" into stage-aosp-master am:
e17aa09136
am:
1c7ae6507e
Change-Id: I31224c1a0bef8074c4d569137b3134d28039ee58
Cindy Kuang [Fri, 11 Aug 2017 22:02:22 +0000 (22:02 +0000)]
Merge "Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2 am:
f125024688" into oc-dr1-dev-plus-aosp
am:
3ae1e07073
Change-Id: Idce519ed971742f869003fd70684615829cbe19b
Winson Chung [Fri, 11 Aug 2017 22:00:51 +0000 (22:00 +0000)]
Merge "Fixing typo in swipe helper causing views not to be faded when swiped." into oc-mr1-dev
am:
35ebb3c535
Change-Id: I6c37b1732ac7941f5504b1c5d9ac8e13d8715606
Cindy Kuang [Fri, 11 Aug 2017 21:57:15 +0000 (21:57 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
07f5257b19" into oc-dr1-dev-plus-aosp am:
1c634381b1
am:
d7522c5c8c
Change-Id: I8e0c0e818a260b64fe95492d4244a77fd675cb79
TreeHugger Robot [Fri, 11 Aug 2017 21:56:59 +0000 (21:56 +0000)]
Merge "Promoting installExistingPackage to SystemApi" into oc-mr1-dev
Android Build Merger (Role) [Fri, 11 Aug 2017 21:53:08 +0000 (21:53 +0000)]
Merge "Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev am:
84626a4e3d" into oc-dr1-dev-plus-aosp
Steven Moreland [Fri, 11 Aug 2017 21:51:12 +0000 (21:51 +0000)]
Merge "aapt2_jni: use proper nativehelper headers" into stage-aosp-master
am:
e17aa09136
Change-Id: Ic9b83ef13c9063f70c1d8af6ab95085f17afa4be
TreeHugger Robot [Fri, 11 Aug 2017 21:49:22 +0000 (21:49 +0000)]
Merge "Fix a bug that SurfaceView loses transformation" into oc-mr1-dev
Steven Moreland [Fri, 11 Aug 2017 21:48:37 +0000 (21:48 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" am:
75c9e4d594 am:
e04a0bf5c7 am:
99cb134bf2 -s ours
am:
7c9f93d832 -s ours
Change-Id: I3b96834e93a0787075902b6464c0b6cbef9d102e
Android Build Merger (Role) [Fri, 11 Aug 2017 21:48:29 +0000 (21:48 +0000)]
Merge "Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2 am:
f125024688" into oc-mr1-dev
Cindy Kuang [Fri, 11 Aug 2017 21:48:21 +0000 (21:48 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2 am:
e4f02db258 am:
51bc4b6c32
am:
c5f6633fdc
Change-Id: I2dc793d60ec75c340b9ae64a0464303e92b41c62
Jeff Sharkey [Fri, 11 Aug 2017 21:45:58 +0000 (15:45 -0600)]
Only destroy the storage area that had trouble.
Consider the case where CE failed to prepare; we'd destroy both DE
and CE, but then only recreate CE. This change makes sure we only
destroy something we're willing to recreate.
Bug:
62338545
Test: builds, boots
Change-Id: I566791b59b35a30db70b0de3acfe624b239bf5d2
Jason Monk [Fri, 11 Aug 2017 21:44:46 +0000 (21:44 +0000)]
Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev
am:
84626a4e3d
Change-Id: I7bcd02a6eeefd326d6f719ea3052674ecf2a1529
Android Build Merger (Role) [Fri, 11 Aug 2017 21:43:59 +0000 (21:43 +0000)]
Merge "Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2 am:
f125024688" into oc-dr1-dev-plus-aosp
Cindy Kuang [Fri, 11 Aug 2017 21:43:11 +0000 (21:43 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
1e6401b07e" into oc-dr1-dev-plus-aosp am:
a54ab7edf4
am:
3e85fa11ea
Change-Id: I3219a23702cb0d597093f03d2bebcf21722ca695
Cindy Kuang [Fri, 11 Aug 2017 21:42:58 +0000 (21:42 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2
am:
f125024688
Change-Id: If510d503dc91c2bfd6a7a282dbf7210cbc7f2698
Android Build Merger (Role) [Fri, 11 Aug 2017 21:40:57 +0000 (21:40 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
07f5257b19" into oc-mr1-dev
Cindy Kuang [Fri, 11 Aug 2017 21:38:58 +0000 (21:38 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2
am:
f125024688
Change-Id: I3722fb9dc286ca00da780ba15346ea0a88ea6d3e
TreeHugger Robot [Fri, 11 Aug 2017 21:38:41 +0000 (21:38 +0000)]
Merge "Change PiP menu activity title to prevent duplicate announcement." into oc-mr1-dev
Cindy Kuang [Fri, 11 Aug 2017 21:38:13 +0000 (21:38 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
07f5257b19" into oc-dr1-dev-plus-aosp
am:
1c634381b1
Change-Id: Ib24f1f55eadcb9076fd81014c2afcab7e173ca4e
OSDN Git Service
