OSDN Git Service
Mathieu Chartier [Tue, 31 Oct 2017 23:57:53 +0000 (23:57 +0000)]
Merge changes I2ef3737f,If080281f am:
bb3de35e5f
am:
18a93665a0 -s ours
Change-Id: Ic8b4862eca342e5b9705c16879d800005a2291bf
Jeff Sharkey [Tue, 31 Oct 2017 23:48:13 +0000 (23:48 +0000)]
Merge "Change storage migration to use quota APIs." am:
0fccecc6a0
am:
83fabf2fd6 -s ours
Change-Id: I9023d8214f0f899d6065a074a92e80dea7359280
Steven Moreland [Tue, 31 Oct 2017 23:40:34 +0000 (23:40 +0000)]
Merge "Reland "HIDL Java getService now the same as C++."" am:
c1616f6820
am:
0c6f0240b2
Change-Id: I35ee525aaa1563cc6d8fde5dac1e38e04803bb38
Mathieu Chartier [Tue, 31 Oct 2017 22:31:32 +0000 (22:31 +0000)]
Merge changes I2ef3737f,If080281f
am:
bb3de35e5f
Change-Id: Ibe1af669d200057f1d91142299055694b55b5660
Jeff Sharkey [Tue, 31 Oct 2017 22:22:21 +0000 (22:22 +0000)]
Merge "Change storage migration to use quota APIs."
am:
0fccecc6a0
Change-Id: I15f1aa9f01b5cef928b8b68e2568bf67e1e387b9
Steven Moreland [Tue, 31 Oct 2017 22:16:18 +0000 (22:16 +0000)]
Merge "Reland "HIDL Java getService now the same as C++.""
am:
c1616f6820
Change-Id: I5d53c369ae9cb1bc963b06e734cf9c47ad61265f
Treehugger Robot [Tue, 31 Oct 2017 21:48:30 +0000 (21:48 +0000)]
Merge changes I2ef3737f,If080281f
* changes:
Add property for system server compiler filter
Compile secondary dex at boot after OTA
Treehugger Robot [Tue, 31 Oct 2017 21:47:19 +0000 (21:47 +0000)]
Merge "Change storage migration to use quota APIs."
Treehugger Robot [Tue, 31 Oct 2017 21:15:31 +0000 (21:15 +0000)]
Merge "Reland "HIDL Java getService now the same as C++.""
Leon Scroggins III [Tue, 31 Oct 2017 21:08:53 +0000 (21:08 +0000)]
Merge "Throw OOME if Bitmap.nativeCreate fails" into oc-dev am:
c4049e247f am:
5fe26063fe
am:
49767aa7f7
Change-Id: Ic39deeaf1f9f8a50da5818302c4e4fa626a79665
Leon Scroggins III [Tue, 31 Oct 2017 20:44:22 +0000 (20:44 +0000)]
Merge "Throw OOME if Bitmap.nativeCreate fails" into oc-dev am:
c4049e247f
am:
5fe26063fe
Change-Id: Id5c198a7f1a893f9d8f39dfd2927c471a624c3ef
Leon Scroggins III [Tue, 31 Oct 2017 20:29:00 +0000 (20:29 +0000)]
Merge "Throw OOME if Bitmap.nativeCreate fails" into oc-dev
am:
c4049e247f
Change-Id: I7636d9eaf3983fc7ed0c1dc59ec2671ff762206e
TreeHugger Robot [Tue, 31 Oct 2017 20:16:27 +0000 (20:16 +0000)]
Merge "Throw OOME if Bitmap.nativeCreate fails" into oc-dev
Steven Moreland [Wed, 25 Oct 2017 04:50:46 +0000 (04:50 +0000)]
Reland "HIDL Java getService now the same as C++."
Add getService(retry) for Java for C++ feature parity.
Test: hidl_test_java, boot
Bug:
67981006
Change-Id: I4e6711f8c2d7ad0ef6994ce9c480118320e1bde8
Siyamed Sinir [Tue, 31 Oct 2017 18:52:25 +0000 (18:52 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991 am:
cc2fcef375 am:
6ad6e7f2f4 am:
43c494cb9c
am:
d08f60ba71
Change-Id: Ib7093da46b6aa094fc0b945802fc6f19bc39a2cf
Siyamed Sinir [Tue, 31 Oct 2017 18:36:58 +0000 (18:36 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991 am:
cc2fcef375 am:
6ad6e7f2f4
am:
43c494cb9c
Change-Id: I398b3011295e2783f23ca7993cbca273fef38e47
Mathieu Chartier [Fri, 16 Jun 2017 02:09:38 +0000 (19:09 -0700)]
Add property for system server compiler filter
The property is dalvik.vm.systemservercompilerfilter, this changes
if dexopt is needed.
(cherry picked from commit
5e07a0d9cacb1bf943f4617b1edcb930e1578dad)
Bug:
62356545
Test: adb shell setprop dalvik.vm.systemservercompilerfilter quicken
Test: adb shell stop && adb shell start
Merged-In: I2ef3737f24816a4cb75e718abf274a891eb9fda1
Change-Id: I2ef3737f24816a4cb75e718abf274a891eb9fda1
Siyamed Sinir [Tue, 31 Oct 2017 18:21:55 +0000 (18:21 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991 am:
cc2fcef375
am:
6ad6e7f2f4
Change-Id: Ieafefbc852220055c45d1a019def6f2ec9a6df4c
Siyamed Sinir [Tue, 31 Oct 2017 18:10:52 +0000 (18:10 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991
am:
cc2fcef375
Change-Id: I6c7a98c8e38a38dcd9ea2aa423ee93dbd0f12ed4
Siyamed Sinir [Tue, 31 Oct 2017 17:59:25 +0000 (17:59 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a
am:
9422f6e991
Change-Id: I0097c1c1780c285adfd17c9faf277acbcaf9803d
Siyamed Sinir [Tue, 31 Oct 2017 17:41:58 +0000 (17:41 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e
am:
b353fbcb7a
Change-Id: Iba3d14106f47f98643a6a02b67bcc14437755217
Siyamed Sinir [Tue, 31 Oct 2017 17:18:57 +0000 (17:18 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf
am:
eb863a6b2e
Change-Id: Iacb16edfcc470e3f030324ee75e6eb623ee2c91c
Siyamed Sinir [Tue, 31 Oct 2017 17:05:15 +0000 (17:05 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856
am:
eeb90235bf
Change-Id: I3125788140ad50b492d4f361b77db1d187f7c952
Shubham Ajmera [Fri, 9 Jun 2017 22:40:58 +0000 (15:40 -0700)]
Compile secondary dex at boot after OTA
(cherry picked from commit
ce54397368dc98182d7b4eb2ff3c142bbd87e39d)
Bug:
38413085
Test: build successful
Merged-In: If080281fb3147fea625bcafce91167e8c1439736
Change-Id: If080281fb3147fea625bcafce91167e8c1439736
Siyamed Sinir [Tue, 31 Oct 2017 16:55:04 +0000 (16:55 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev am:
31bcb22572 am:
88f92e101d
am:
5878e9c46b
Change-Id: Id2e10f670cf6687fe62dbe67bb7615b9121743f4
Siyamed Sinir [Tue, 31 Oct 2017 16:53:16 +0000 (16:53 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b
am:
bc56010856
Change-Id: I2e2cc32e794f498843e6d6f468fdc6e9f8fc5026
Jeff Sharkey [Thu, 6 Jul 2017 17:29:06 +0000 (11:29 -0600)]
Change storage migration to use quota APIs.
New quota APIs are much faster than trying to measure manually, and
removing this last user of calculateDirectorySize() means we can
remove it once and for all.
(cherry picked from commit
c8b29ac6f0340bd0c3c9eb388c4be2d446de9a59)
Bug:
36056324
Test: builds, boots
Merged-In: Ibdf1ee4e8885680e106df6a9269b6309ddc61af8
Change-Id: Ibdf1ee4e8885680e106df6a9269b6309ddc61af8
Siyamed Sinir [Tue, 31 Oct 2017 16:42:48 +0000 (16:42 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev am:
31bcb22572
am:
88f92e101d
Change-Id: Idd1358c39e0d4914bc7672707bf4b989a7c28815
Siyamed Sinir [Tue, 31 Oct 2017 16:42:29 +0000 (16:42 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03
am:
1f8536653b
Change-Id: Idbf65d9e9db40c7dfa2456f3e807890c88dcbb3d
Siyamed Sinir [Tue, 31 Oct 2017 16:34:29 +0000 (16:34 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a
am:
c275b77b03
Change-Id: Ia2887869c4ac6cdcd1a66372b991b9f78edf7679
Andrew Solovay [Tue, 31 Oct 2017 16:31:12 +0000 (16:31 +0000)]
Merge "docs: Fix documentation typo" into oc-mr1-dev
am:
f8fb25ca04
Change-Id: I450ba09a2f6efb155601cd08fe9e1d0c35e9fec5
Siyamed Sinir [Tue, 31 Oct 2017 16:31:04 +0000 (16:31 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev
am:
31bcb22572
Change-Id: I9751a0c4dd069908e1d0a1a5d3657c7b5c7c1005
Siyamed Sinir [Tue, 31 Oct 2017 16:25:26 +0000 (16:25 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev
am:
a0c253d07a
Change-Id: I9040d5dcde6228ea3f10bc03077800d2b070cbb1
Siyamed Sinir [Tue, 31 Oct 2017 16:17:06 +0000 (16:17 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev
Siyamed Sinir [Tue, 31 Oct 2017 16:16:16 +0000 (16:16 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev
Andrew Solovay [Tue, 31 Oct 2017 16:15:57 +0000 (16:15 +0000)]
Merge "docs: Fix documentation typo" into oc-mr1-dev
Colin Cross [Tue, 31 Oct 2017 15:42:52 +0000 (15:42 +0000)]
Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES" am:
834be81189
am:
8476a2c75d
Change-Id: I005a2a4b02c2c0665e2f3aa84d59c5202a8991cb
Colin Cross [Tue, 31 Oct 2017 15:33:53 +0000 (15:33 +0000)]
Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES"
am:
834be81189
Change-Id: Iec1547cc91bf3cb08a47194e91838eb77b4126d7
Treehugger Robot [Tue, 31 Oct 2017 15:24:11 +0000 (15:24 +0000)]
Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES"
Tobias Thierer [Tue, 31 Oct 2017 13:51:26 +0000 (13:51 +0000)]
Merge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com" am:
b519569eb3
am:
4f59edb63f
Change-Id: If74e0f6783bb38c707a3575821255e8f1ec4d78f
Tobias Thierer [Tue, 31 Oct 2017 13:41:34 +0000 (13:41 +0000)]
Merge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com"
am:
b519569eb3
Change-Id: Ib9099673a4b643b10f38a0c94ddea49949f796eb
Treehugger Robot [Tue, 31 Oct 2017 13:26:23 +0000 (13:26 +0000)]
Merge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com"
Abodunrinwa Toki [Tue, 31 Oct 2017 03:36:50 +0000 (03:36 +0000)]
Merge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev am:
66ca42d5ac am:
f247977cbe -s ours
am:
91fc6d303e -s ours
Change-Id: I390fbea45448e5910648b8e804ce54d77b8b8d01
Abodunrinwa Toki [Tue, 31 Oct 2017 03:23:35 +0000 (03:23 +0000)]
Merge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev am:
66ca42d5ac
am:
f247977cbe -s ours
Change-Id: I124dc4a15563effa89049e87efe2304867d05961
Abodunrinwa Toki [Tue, 31 Oct 2017 03:10:06 +0000 (03:10 +0000)]
Merge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev
am:
66ca42d5ac
Change-Id: I0e57e666f790c94ddf04d304a633c835a99d3d69
TreeHugger Robot [Tue, 31 Oct 2017 03:01:08 +0000 (03:01 +0000)]
Merge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev
Hansong Zhang [Tue, 31 Oct 2017 02:50:44 +0000 (02:50 +0000)]
Merge "Fix Robolectric Bluetooth tests" am:
01c9c0e4ba
am:
2f1cb548ba
Change-Id: Ifded4e54edd53242a40d3f8e123f614cd6e44d84
Hansong Zhang [Tue, 31 Oct 2017 02:40:45 +0000 (02:40 +0000)]
Merge "Fix Robolectric Bluetooth tests"
am:
01c9c0e4ba
Change-Id: I7987ddaa520c202a15af03bf0791c39a1720d3b3
Treehugger Robot [Tue, 31 Oct 2017 02:25:31 +0000 (02:25 +0000)]
Merge "Fix Robolectric Bluetooth tests"
Chong Zhang [Tue, 31 Oct 2017 00:55:23 +0000 (00:55 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am:
914bc14e82 am:
f9e16c9899 am:
396487f5aa am:
5330335288 am:
db258ebba8 am:
e3ac25eb0c am:
bd7101937a
am:
b48acd86c0
Change-Id: I5aba8558427da76da5bbe331c207f04415990ac1
Chong Zhang [Tue, 31 Oct 2017 00:41:00 +0000 (00:41 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am:
914bc14e82 am:
f9e16c9899 am:
396487f5aa am:
5330335288 am:
db258ebba8 am:
e3ac25eb0c
am:
bd7101937a
Change-Id: I78a26c3abfb72e9b873b719506f869df0aa87da1
Romain Guy [Thu, 31 Aug 2017 23:08:42 +0000 (16:08 -0700)]
docs: Fix documentation typo
CPd from master so we can update the website.
Test: make ds-docs
Bug:
65213121
Change-Id: I5bfc7074a42ec0ef5cd624b0bb72234e072684d3
(cherry picked from commit
d4012d6505c8b5368ee4607d54fb98d0a96ec136)
Chong Zhang [Tue, 31 Oct 2017 00:26:33 +0000 (00:26 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am:
914bc14e82 am:
f9e16c9899 am:
396487f5aa am:
5330335288 am:
db258ebba8
am:
e3ac25eb0c
Change-Id: Iba4bcd510ea20aa6fe928074912a864fe325680a
Chong Zhang [Tue, 31 Oct 2017 00:11:32 +0000 (00:11 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am:
914bc14e82 am:
f9e16c9899 am:
396487f5aa am:
5330335288
am:
db258ebba8
Change-Id: Ic9821f05d30a57fad1567e834804cec6ff5dca97
Hansong Zhang [Mon, 30 Oct 2017 23:38:16 +0000 (16:38 -0700)]
Fix Robolectric Bluetooth tests
The Bluetooth HID profile name BluetoothInputDevice is recently changed
to BluetoothHidHost, but it is not updated in the SDK for Robolectric
tests, and it causes problems with SettingsLib tests. Thus, we need to
replace the HID profile use case with PAN. This change will not
influence the test coverage.
Test: make RunSettingsLibRoboTests
Bug:
68213274
Change-Id: If30ef0e82252d8f7229815b80e403ae63ab10643
Chong Zhang [Mon, 30 Oct 2017 23:48:44 +0000 (23:48 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am:
914bc14e82 am:
f9e16c9899 am:
396487f5aa
am:
5330335288
Change-Id: Ic7b7f250073c4c89ac853036516bcade6b875092
Chong Zhang [Mon, 30 Oct 2017 23:33:04 +0000 (23:33 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am:
914bc14e82 am:
f9e16c9899
am:
396487f5aa
Change-Id: Idf1ec8982316d3cef253609c702435a21d8f2eed
Chong Zhang [Mon, 30 Oct 2017 23:16:40 +0000 (23:16 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am:
914bc14e82
am:
f9e16c9899
Change-Id: Id780ff2bfb2f3881cbf33032971ed3b397a2fcde
Chong Zhang [Mon, 30 Oct 2017 23:00:59 +0000 (23:00 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev
am:
914bc14e82
Change-Id: I9f8e2264e93590de4179ee5c6ab30c7509e775f5
Chong Zhang [Mon, 30 Oct 2017 22:46:40 +0000 (22:46 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev
Andrew Solovay [Mon, 30 Oct 2017 18:15:21 +0000 (18:15 +0000)]
Merge "docs: Clarify wording on two Javadoc entries" into oc-mr1-dev
am:
b1748f87b1
Change-Id: I2336a38fb00f2c53406718e4e3a47f989ed1c094
Android Build Merger (Role) [Mon, 30 Oct 2017 18:08:55 +0000 (18:08 +0000)]
Merge "Merge "Track moving of OkHttp facade API to new package." am:
45183fc5a7 am:
1f7fcb7970" into oc-mr1-dev-plus-aosp
Tobias Thierer [Mon, 30 Oct 2017 18:05:53 +0000 (18:05 +0000)]
Merge "Track moving of OkHttp facade API to new package." am:
45183fc5a7
am:
1f7fcb7970
Change-Id: I16e01dde45dd70cfb4ea43a81e728350a5b26d3f
Andrew Solovay [Mon, 30 Oct 2017 18:02:54 +0000 (18:02 +0000)]
Merge "docs: Clarified description of height and width attrs" into oc-mr1-dev
am:
ddad5593c2
Change-Id: Ic081252fdc2a9a82a68cee4c568fcd0b95ccd559
Tobias Thierer [Mon, 30 Oct 2017 17:52:00 +0000 (17:52 +0000)]
OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com
He prefers to use his @android.com account.
Test: Treehugger
Bug:
63673347
Exempt-From-Owner-Approval: Allow @android.com to approve this CL :)
Change-Id: Ie80cc7864de7b91ae44ad57f0bae9b859d034803
TreeHugger Robot [Mon, 30 Oct 2017 17:51:37 +0000 (17:51 +0000)]
Merge "docs: Clarify wording on two Javadoc entries" into oc-mr1-dev
Tobias Thierer [Mon, 30 Oct 2017 17:51:28 +0000 (17:51 +0000)]
Merge "Track moving of OkHttp facade API to new package."
am:
45183fc5a7
Change-Id: Ied0bf8a62be2dd2038adf3de2251419bf5f3e964
TreeHugger Robot [Mon, 30 Oct 2017 17:49:09 +0000 (17:49 +0000)]
Merge "docs: Clarified description of height and width attrs" into oc-mr1-dev
Tobias Thierer [Mon, 30 Oct 2017 17:40:36 +0000 (17:40 +0000)]
Merge "Track moving of OkHttp facade API to new package."
Tobias Thierer [Tue, 24 Oct 2017 23:58:29 +0000 (00:58 +0100)]
Track moving of OkHttp facade API to new package.
Another CL in this topic moves the classes from
libcore.net.http
to
com.squareup.okhttp.internalandroidapi.
In jarjar'ed build targets, this becomes
com.android.okhttp.internalandroidapi.
This facade constitutes the API via which non-libcore parts
of the Android platform (currently framework) may access
OkHttp. It's moving because libcore.net.http is already
part of libcore, and the overlap of packages is problematic
for builds with EXPERIMENTAL_USE_OPENJDK9 set to true.
Bug:
68220880
Test: Treehugger
Change-Id: Ia79966563cc0b5ab0923d54c21e54b6192d8c990
Exempt-From-Owner-Approval: Jeff Sharkey is an owner, but only one of his accounts is listed as an owner (@android.com vs. @google.com)
Adrian DC [Mon, 30 Oct 2017 15:58:39 +0000 (15:58 +0000)]
Merge "Quick Settings: Avoid expand indicators shortly showing on edit" am:
47c83a5f9d
am:
18a6d4990a
Change-Id: I033cf9cf74c3fe8d80791cc5039a1530332eaabc
Adrian DC [Mon, 30 Oct 2017 15:42:14 +0000 (15:42 +0000)]
Merge "Quick Settings: Avoid expand indicators shortly showing on edit"
am:
47c83a5f9d
Change-Id: Id07c6a9413fb3f647d8ead5a77012800ce5b1bc8
Treehugger Robot [Mon, 30 Oct 2017 15:25:27 +0000 (15:25 +0000)]
Merge "Quick Settings: Avoid expand indicators shortly showing on edit"
Bill Yi [Mon, 30 Oct 2017 07:27:55 +0000 (07:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
752457eaa7 -s ours
Change-Id: Ic59f51775abc8f531237e5832631ee1217a0dd8c
Bill Yi [Mon, 30 Oct 2017 07:20:17 +0000 (07:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
eecf81e227 -s ours
Change-Id: I4b9c9b2147144a2d407b6389ed3ed0cf0ab05428
Bill Yi [Mon, 30 Oct 2017 07:14:49 +0000 (07:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
6b4ac5d17b -s ours
Change-Id: Ibd0a8fb760994424d34fa23f55b823e9dd2795f8
Bill Yi [Mon, 30 Oct 2017 07:01:17 +0000 (07:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
68b49a3a8e -s ours
Change-Id: I1249381abcb2c1610a8671af6993121c24280234
Bill Yi [Mon, 30 Oct 2017 06:53:47 +0000 (06:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
d4ebf7c597 -s ours
Change-Id: I481f1ba311d3d020d789c33b8601886babe96b55
TreeHugger Robot [Mon, 30 Oct 2017 06:49:07 +0000 (06:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Mon, 30 Oct 2017 06:48:58 +0000 (06:48 +0000)]
Import translations. DO NOT MERGE
am:
0159791633 -s ours
Change-Id: I7f9b5f26161dd3991584e46e5d899884ec7e245d
TreeHugger Robot [Mon, 30 Oct 2017 06:48:16 +0000 (06:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Mon, 30 Oct 2017 06:44:09 +0000 (06:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Mon, 30 Oct 2017 06:43:27 +0000 (06:43 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Mon, 30 Oct 2017 06:39:40 +0000 (06:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Jeff Sharkey [Mon, 30 Oct 2017 03:26:54 +0000 (03:26 +0000)]
Merge "Define OWNERS for permission grant changes." am:
8d2a5bd42a
am:
4ab5a3f8cd
Change-Id: Ie27d6ee76a7ab6585881d5f83c197ab99f7d26f4
Jeff Sharkey [Mon, 30 Oct 2017 03:11:43 +0000 (03:11 +0000)]
Merge "Define OWNERS for permission grant changes."
am:
8d2a5bd42a
Change-Id: Ib91c1ecc3d673ba103f966008609d2444107eb7e
Treehugger Robot [Mon, 30 Oct 2017 03:00:55 +0000 (03:00 +0000)]
Merge "Define OWNERS for permission grant changes."
Jeff Sharkey [Fri, 27 Oct 2017 18:13:37 +0000 (12:13 -0600)]
Define OWNERS for permission grant changes.
Permission grant changes need explicit approval from product and
SWE leadership to ensure that CTS/CDD requirements are met.
Change-Id: I0a84712b5c5b4e11e72bf5921b72ef6a47e7fdc1
Mengjun Leng [Sun, 29 Oct 2017 18:11:58 +0000 (18:11 +0000)]
Merge "Add support for send Message with messaging options" am:
1400db6748
am:
340b410675
Change-Id: I5f35e53048993fee9af7731734aa5f87380c8148
Mengjun Leng [Sun, 29 Oct 2017 17:58:43 +0000 (17:58 +0000)]
Merge "Add support for send Message with messaging options"
am:
1400db6748
Change-Id: I29ffbb64c35214761b7f6921212920cf8ffc8599
Treehugger Robot [Sun, 29 Oct 2017 17:48:44 +0000 (17:48 +0000)]
Merge "Add support for send Message with messaging options"
Bill Yi [Sun, 29 Oct 2017 16:50:30 +0000 (09:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I6fd17c5a36e39a9a2009b6da91b7bc9aa1d7a251
Bill Yi [Sun, 29 Oct 2017 15:05:49 +0000 (08:05 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: If774e276d4d0e78233d6b22edbf33900ef866390
Bill Yi [Sun, 29 Oct 2017 14:33:12 +0000 (07:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic418f5712f192bb12d935713042b22b124817725
Bill Yi [Sun, 29 Oct 2017 14:25:41 +0000 (07:25 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I837b9a3c84d21544715855d80fc04af6fddf7b95
Bill Yi [Sun, 29 Oct 2017 14:17:58 +0000 (07:17 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I8f07e45a24fa38ff073987f7750f69a18499bf48
Adrian DC [Tue, 24 Oct 2017 19:17:03 +0000 (21:17 +0200)]
Quick Settings: Avoid expand indicators shortly showing on edit
* Upon entering of the Quick Settings edit view, during
the animation, all the expand indicators are rarely
visible for a short period of time until hidden
* To avoid this visual glitch, hide the expand_indicator
by default and let the code show it when necessary
instead of hiding it for most cases
Change-Id: Ia14d9a8d63178ccb54fbcb969ddf51f06c88f35c
Signed-off-by: Adrian DC <radian.dc@gmail.com>
Bill Yi [Sun, 29 Oct 2017 04:52:30 +0000 (21:52 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I2bf31993c0e7b7d6afec824c0163c85097a8c89c
Felipe Leme [Sat, 28 Oct 2017 03:02:58 +0000 (03:02 +0000)]
Merge "Minor fixes on SaveInfo javadoc." into oc-mr1-dev
am:
e72d655f1d
Change-Id: Ib3e6de8f42833f22bc50c949a0a346853485b130
TreeHugger Robot [Sat, 28 Oct 2017 02:45:48 +0000 (02:45 +0000)]
Merge "Minor fixes on SaveInfo javadoc." into oc-mr1-dev
OSDN Git Service
