OSDN Git Service
Christopher Tate [Fri, 23 Jun 2017 19:48:26 +0000 (12:48 -0700)]
Implement key/value quota-overrun detection in LocalTransport
We now preflight the effect of a k/v backup delta set against the
current contents of the datastore, so we can detect and report a
quota overrun nondestructively.
Test: bit CtsBackupTestCases:.KeyValueQuotaTest
Change-Id: If69687b891271d7bbb46c3a66728b716dc51fc39
Siddharth Ray [Fri, 23 Jun 2017 17:43:18 +0000 (17:43 +0000)]
Merge "Merge "Emergency SUPL when location is disabled" into oc-dev am:
2ffd98670f am:
41bf50cc8b -s ours" into oc-dr1-dev-plus-aosp
am:
36ddd7d08a -s ours
Change-Id: I7c45d1ce6ff3b67b28ed772a2e46438a9df30565
Siddharth Ray [Fri, 23 Jun 2017 17:39:56 +0000 (17:39 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dev am:
2ffd98670f -s ours am:
f79158f5ac -s ours
am:
2053ea450c -s ours
Change-Id: Idd185de4589884ec793f06589e61fea52f1e1f19
Android Build Merger (Role) [Fri, 23 Jun 2017 17:30:45 +0000 (17:30 +0000)]
Merge "Merge "Emergency SUPL when location is disabled" into oc-dev am:
2ffd98670f am:
41bf50cc8b -s ours" into oc-dr1-dev-plus-aosp
Siddharth Ray [Fri, 23 Jun 2017 17:29:46 +0000 (17:29 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dev am:
2ffd98670f -s ours
am:
f79158f5ac -s ours
Change-Id: Ie6cd440bfe4e0294a400008ca7c6c0e7172f0f6a
Siddharth Ray [Fri, 23 Jun 2017 17:29:40 +0000 (17:29 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dev am:
2ffd98670f
am:
41bf50cc8b -s ours
Change-Id: I4ab0165d67a75794ca9559b96a533eb5789dd93a
Siddharth Ray [Fri, 23 Jun 2017 17:19:45 +0000 (17:19 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dev
am:
2ffd98670f
Change-Id: I7f57683e774109f301e0763607853674c6fda9c9
Siddharth Ray [Fri, 23 Jun 2017 17:19:37 +0000 (17:19 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dev
am:
2ffd98670f -s ours
Change-Id: I44d903a9ce1a53faa9e1633cc8d69e322454704d
TreeHugger Robot [Fri, 23 Jun 2017 17:12:22 +0000 (17:12 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dev
TreeHugger Robot [Fri, 23 Jun 2017 17:11:17 +0000 (17:11 +0000)]
Merge "Remove a redundant synchronized block"
TreeHugger Robot [Fri, 23 Jun 2017 16:43:23 +0000 (16:43 +0000)]
Merge "Rate limit notification sounds/vibrations"
Meng Wang [Fri, 23 Jun 2017 16:20:40 +0000 (16:20 +0000)]
Merge "Show error code in WFC error messages." into oc-dr1-dev am:
a871f0f131
am:
8868ecdf7c
Change-Id: Id404a42a50c36f3fd223bf33cee640d0084944ee
Meng Wang [Fri, 23 Jun 2017 16:08:08 +0000 (16:08 +0000)]
Merge "Show error code in WFC error messages." into oc-dr1-dev
am:
a871f0f131
Change-Id: Ibab724fa3f48e765fbd208e5ab0b9af32fcef38d
Meng Wang [Fri, 23 Jun 2017 16:00:50 +0000 (16:00 +0000)]
Merge "Show error code in WFC error messages." into oc-dr1-dev
Eric Laurent [Fri, 23 Jun 2017 15:52:50 +0000 (15:52 +0000)]
Merge "Add offset for AV sync header."
Bill Yi [Fri, 23 Jun 2017 15:47:28 +0000 (15:47 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
b39c08f9d7 -s ours am:
53f4db5612 -s ours" into oc-dr1-dev-plus-aosp
am:
a76010fa02 -s ours
Change-Id: I682e4b95710264b8e31634aa25b934da3a2427b9
Bill Yi [Fri, 23 Jun 2017 15:44:59 +0000 (15:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
b39c08f9d7 -s ours am:
3cd12a1ca7 -s ours
am:
516b3e7195 -s ours
Change-Id: I60f074c5eb4cd1d50ec22a9c1860e84e6f2d4bfe
Android Build Merger (Role) [Fri, 23 Jun 2017 15:36:07 +0000 (15:36 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
64465df428 -s ours am:
cdb756273d -s ours"
TreeHugger Robot [Fri, 23 Jun 2017 15:34:54 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Fri, 23 Jun 2017 15:33:47 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
64465df428 -s ours
am:
cdb756273d -s ours
Change-Id: I2b541eccb57f49daf56c6f35c7ae1f0eb1559552
Android Build Merger (Role) [Fri, 23 Jun 2017 15:32:57 +0000 (15:32 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
b39c08f9d7 -s ours am:
53f4db5612 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Fri, 23 Jun 2017 15:31:44 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
ccaf50b6a7 -s ours
am:
931bc5accc -s ours
Change-Id: Ib1dd44878ae38b011d28e23a7503b1621ef88a7f
Bill Yi [Fri, 23 Jun 2017 15:30:56 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
b39c08f9d7 -s ours
am:
53f4db5612 -s ours
Change-Id: I74facd707fb3203105b66d6853052bef461e4419
Bill Yi [Fri, 23 Jun 2017 15:30:52 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
b39c08f9d7 -s ours
am:
3cd12a1ca7 -s ours
Change-Id: Ibf672901baeae0668e40f04c37b2ab56801b5864
Bill Yi [Fri, 23 Jun 2017 15:21:28 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
b39c08f9d7 -s ours
Change-Id: I32484f5c5715c17c439d5ff20fcd8e46b8061c18
Bill Yi [Fri, 23 Jun 2017 15:21:23 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
64465df428 -s ours
Change-Id: Iec197b243600ad21d9e58b272961d3d9ba167f42
Bill Yi [Fri, 23 Jun 2017 15:21:22 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
b39c08f9d7 -s ours
Change-Id: Ib2921d235716e858bddbbb2e3a9588b4133d9c84
TreeHugger Robot [Fri, 23 Jun 2017 15:20:11 +0000 (15:20 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 23 Jun 2017 15:16:40 +0000 (15:16 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 23 Jun 2017 15:12:07 +0000 (15:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Fri, 23 Jun 2017 15:11:46 +0000 (15:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 23 Jun 2017 15:11:07 +0000 (15:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
ccaf50b6a7 -s ours
Change-Id: I95cc8323a6e20d4cdc604dafd0b268fcb42b66d9
TreeHugger Robot [Fri, 23 Jun 2017 15:10:47 +0000 (15:10 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 23 Jun 2017 15:10:04 +0000 (15:10 +0000)]
Merge "Remove 'unused' import"
TreeHugger Robot [Fri, 23 Jun 2017 15:01:06 +0000 (15:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Fri, 23 Jun 2017 13:25:25 +0000 (13:25 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
d406f38d24 -s ours am:
8c311afb87 -s ours" into oc-dr1-dev-plus-aosp
am:
de6aafd00f -s ours
Change-Id: Ie552b73caf6039ddc4063112a079d486bce8f537
Bill Yi [Fri, 23 Jun 2017 13:22:56 +0000 (13:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
d406f38d24 -s ours am:
08947751fd -s ours
am:
a23e69f247 -s ours
Change-Id: I9b4b45c914a37deb96d00ceb4b9068c61d1cae53
Winson Chung [Fri, 23 Jun 2017 13:20:36 +0000 (13:20 +0000)]
Merge "Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev am:
cd73cc4c6d" into oc-dr1-dev am:
fda69197b1
am:
f226cca28b
Change-Id: I21259fb921973eb2bcecbd9254463af856b75d37
Bill Yi [Fri, 23 Jun 2017 13:18:04 +0000 (13:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
9c543b5a06 -s ours
am:
7bb948b3fa -s ours
Change-Id: Id181e5b66a92c433c45909e3cfb775980129b1ec
Tomasz Wasilczyk [Fri, 23 Jun 2017 13:13:57 +0000 (13:13 +0000)]
Merge "Switch to the new Java-based RadioService."
Vladimir Marko [Fri, 23 Jun 2017 13:06:38 +0000 (13:06 +0000)]
Merge "Merge "Rename Binder.destroy() to Binder.destroyBinder()." am:
a634b38c8e am:
1b4b326128 am:
17bb92fe14" into oc-dr1-dev-plus-aosp
am:
3ec8fd13f8
Change-Id: Ib21b4d3a88558971a51f31f16f9f57e1e54b3fb9
Winson Chung [Fri, 23 Jun 2017 13:04:15 +0000 (13:04 +0000)]
Merge "Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev am:
cd73cc4c6d am:
a8e14f2448" into oc-dr1-dev-plus-aosp
am:
bcda5a74b7
Change-Id: Iefe5c3008beab81054832f43f9bee5af7e14bd39
Roshan Pius [Fri, 23 Jun 2017 13:01:30 +0000 (13:01 +0000)]
Merge "Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev am:
db11f55cb7 am:
7a3df45483" into oc-dr1-dev-plus-aosp
am:
587b8bf664
Change-Id: I812fa913c6333ace879c43d2f29c5d785472e16d
Android Build Merger (Role) [Fri, 23 Jun 2017 12:58:59 +0000 (12:58 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
d406f38d24 -s ours am:
8c311afb87 -s ours" into oc-dr1-dev-plus-aosp
Roshan Pius [Fri, 23 Jun 2017 12:58:36 +0000 (12:58 +0000)]
Merge "Merge "Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev am:
db11f55cb7" into oc-dr1-dev am:
72b2701fbb" into oc-dr1-dev-plus-aosp
am:
986ae9f983
Change-Id: I2d8da7b4470b47aceb7b1534bd18f7a60e6bfa2c
Bill Yi [Fri, 23 Jun 2017 12:58:10 +0000 (12:58 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
d406f38d24 -s ours
am:
8c311afb87 -s ours
Change-Id: Ic0d5736c5d040abc951562fdc984359f76e9e348
Bill Yi [Fri, 23 Jun 2017 12:56:45 +0000 (12:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
d406f38d24 -s ours
am:
08947751fd -s ours
Change-Id: I62dfb3722c51f91adc59a568c6d92e0e608bbf50
Seigo Nonaka [Fri, 23 Jun 2017 12:56:03 +0000 (12:56 +0000)]
Merge "Merge "Stop loading other package's font by default." into oc-dev am:
824d75e0e1 am:
ba12631bba -s ours" into oc-dr1-dev-plus-aosp
am:
4853a717c0 -s ours
Change-Id: I2ddd858d8ad5a5e1277cb266ae373a56cfe08c9e
Neil Fuller [Fri, 23 Jun 2017 12:52:52 +0000 (12:52 +0000)]
Merge "Stop loading other package's font by default." into oc-dr1-dev am:
1ef5cb531d -s ours
am:
ae2e2e0a80 -s ours
Change-Id: Ibbd0c91133b540720e3d4b503ab51523a40ec2d0
Winson Chung [Fri, 23 Jun 2017 12:51:36 +0000 (12:51 +0000)]
Merge "Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev am:
cd73cc4c6d" into oc-dr1-dev
am:
fda69197b1
Change-Id: Ib653a64b6b5d700ebad94cd07a0fb353080a0e8d
Seigo Nonaka [Fri, 23 Jun 2017 12:50:33 +0000 (12:50 +0000)]
Merge "Stop loading other package's font by default." into oc-dev am:
824d75e0e1 -s ours am:
2629b0c1a0 -s ours
am:
34f12cca78 -s ours
Change-Id: I101c072d246fa0fce9c0368551f2463d4d548505
Benjamin Franz [Fri, 23 Jun 2017 12:48:20 +0000 (13:48 +0100)]
Remove 'unused' import
Unused import android.provider.Settings previously caused checkstyle
script to bark on DevicePolicyManager. Remove the import and update all
usages of it in javadocs.
Bug:
37890361
Test: make docs
Change-Id: I3134d97274b2882060f5172170517ce501d5aafd
Bill Yi [Fri, 23 Jun 2017 12:49:16 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
9c543b5a06 -s ours
Change-Id: I4a776102e1ecdfc0da70e0a6a91f0b49e5854edc
Bill Yi [Fri, 23 Jun 2017 12:49:12 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
d406f38d24 -s ours
Change-Id: I898195fead15228c4e4fa5617dacbddfc90dc6e2
Bill Yi [Fri, 23 Jun 2017 12:49:11 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
d406f38d24 -s ours
Change-Id: I45a76be2cec8829147d9ac4569da2087bf6722bd
TreeHugger Robot [Fri, 23 Jun 2017 12:47:17 +0000 (12:47 +0000)]
Merge "Import translations. DO NOT MERGE"
Android Build Merger (Role) [Fri, 23 Jun 2017 12:46:05 +0000 (12:46 +0000)]
Merge "Merge "Rename Binder.destroy() to Binder.destroyBinder()." am:
a634b38c8e am:
1b4b326128 am:
17bb92fe14" into oc-dr1-dev-plus-aosp
Vladimir Marko [Fri, 23 Jun 2017 12:45:17 +0000 (12:45 +0000)]
Merge "Rename Binder.destroy() to Binder.destroyBinder()." am:
a634b38c8e am:
1b4b326128
am:
17bb92fe14
Change-Id: I08ab885e0b4373074e5eba3d36dcbb73c87458dc
Android Build Merger (Role) [Fri, 23 Jun 2017 12:44:54 +0000 (12:44 +0000)]
Merge "Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev am:
cd73cc4c6d am:
a8e14f2448" into oc-dr1-dev-plus-aosp
Winson Chung [Fri, 23 Jun 2017 12:44:01 +0000 (12:44 +0000)]
Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev am:
cd73cc4c6d
am:
a8e14f2448
Change-Id: I2a53a421fbfc3d97309b8b4be1a1a7b215f0c3a1
Android Build Merger (Role) [Fri, 23 Jun 2017 12:43:32 +0000 (12:43 +0000)]
Merge "Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev am:
db11f55cb7 am:
7a3df45483" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 23 Jun 2017 12:42:49 +0000 (12:42 +0000)]
Merge "Merge "Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev am:
db11f55cb7" into oc-dr1-dev am:
72b2701fbb" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Fri, 23 Jun 2017 12:42:32 +0000 (12:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Roshan Pius [Fri, 23 Jun 2017 12:42:12 +0000 (12:42 +0000)]
Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev am:
db11f55cb7
am:
7a3df45483
Change-Id: I9aad81e9015ac22d43c2864ec58213ccb22df54d
Android Build Merger (Role) [Fri, 23 Jun 2017 12:41:42 +0000 (12:41 +0000)]
Merge "Merge "Stop loading other package's font by default." into oc-dev am:
824d75e0e1 am:
ba12631bba -s ours" into oc-dr1-dev-plus-aosp
Roshan Pius [Fri, 23 Jun 2017 12:41:37 +0000 (12:41 +0000)]
Merge "Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev am:
db11f55cb7" into oc-dr1-dev
am:
72b2701fbb
Change-Id: I1ba02ea48136820e8e8efb77421849a1abb47266
Seigo Nonaka [Fri, 23 Jun 2017 12:41:01 +0000 (12:41 +0000)]
Merge "Stop loading other package's font by default." into oc-dev am:
824d75e0e1
am:
ba12631bba -s ours
Change-Id: If5124a045069500c2cf3c52da2533603de5e4816
Seigo Nonaka [Fri, 23 Jun 2017 12:40:09 +0000 (12:40 +0000)]
Stop loading other package's font by default.
am:
c25c3da8b6 -s ours
Change-Id: I603db265b2312ad7177fd7724793fe94db78e3f8
Neil Fuller [Fri, 23 Jun 2017 12:38:04 +0000 (12:38 +0000)]
Merge "Stop loading other package's font by default." into oc-dr1-dev
am:
1ef5cb531d -s ours
Change-Id: I1e4aa0af645bd9dc34e0ebd0ad9ab091d2049aee
Android Build Merger (Role) [Fri, 23 Jun 2017 12:37:23 +0000 (12:37 +0000)]
Merge "Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev am:
cd73cc4c6d" into oc-dr1-dev
TreeHugger Robot [Fri, 23 Jun 2017 12:36:43 +0000 (12:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Winson Chung [Fri, 23 Jun 2017 12:35:23 +0000 (12:35 +0000)]
Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev
am:
cd73cc4c6d
Change-Id: I322cf9616694457762181657a2b51f8a3aff5911
Seigo Nonaka [Fri, 23 Jun 2017 12:35:19 +0000 (12:35 +0000)]
Merge "Stop loading other package's font by default." into oc-dev am:
824d75e0e1 -s ours
am:
2629b0c1a0 -s ours
Change-Id: Ie753fcbec56aab3a6718140a71a0d7e44e4a23dd
TreeHugger Robot [Fri, 23 Jun 2017 12:31:40 +0000 (12:31 +0000)]
Merge "Import translations. DO NOT MERGE"
Android Build Merger (Role) [Fri, 23 Jun 2017 12:29:41 +0000 (12:29 +0000)]
Merge "Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev am:
db11f55cb7" into oc-dr1-dev
Neil Fuller [Fri, 23 Jun 2017 12:28:31 +0000 (12:28 +0000)]
Merge "Stop loading other package's font by default." into oc-dr1-dev
Roshan Pius [Fri, 23 Jun 2017 12:28:27 +0000 (12:28 +0000)]
Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev
am:
db11f55cb7
Change-Id: Id9cb3a6211cf516875c6ad4ac10058bb352ebd46
Seigo Nonaka [Thu, 22 Jun 2017 15:22:18 +0000 (08:22 -0700)]
Stop loading other package's font by default.
Since CONTEXT_RESTRICTED is not a default flag of createPackageContext,
we can't rely on it for preventing unexpected font injections.
To protect developers and existing apps from a risk of font injection,
stop loading font from other package's resouce unless the developer
explicitly set CONTEXT_IGNORE_SECURITY.
Bug:
62813533
Bug:
62879353
Test: Manually done
Merged-In: I4442ddc48dadb5c968b444be86038b602074d301
Change-Id: I4442ddc48dadb5c968b444be86038b602074d301
(cherry picked from commit
6d6cd68660635d670b0cb17f348b7c1da13704b3)
Seigo Nonaka [Fri, 23 Jun 2017 12:23:36 +0000 (12:23 +0000)]
Merge "Stop loading other package's font by default." into oc-dev
am:
824d75e0e1 -s ours
Change-Id: Ib6375fdfa9295add1e4d53f220f3b8d22f48b855
Vladimir Marko [Fri, 23 Jun 2017 10:55:48 +0000 (10:55 +0000)]
Merge "Rename Binder.destroy() to Binder.destroyBinder()." am:
a634b38c8e
am:
1b4b326128
Change-Id: I165243924444f89ee880072c55eba012ccf1d149
Vladimir Marko [Fri, 23 Jun 2017 10:45:32 +0000 (10:45 +0000)]
Merge "Rename Binder.destroy() to Binder.destroyBinder()."
am:
a634b38c8e
Change-Id: I5d80b7a76f1d9b3d7bfc152994551f0cd6defaba
Vladimir Marko [Fri, 23 Jun 2017 10:36:00 +0000 (10:36 +0000)]
Merge "Rename Binder.destroy() to Binder.destroyBinder()."
Seigo Nonaka [Thu, 22 Jun 2017 15:22:18 +0000 (08:22 -0700)]
Stop loading other package's font by default.
Since CONTEXT_RESTRICTED is not a default flag of createPackageContext,
we can't rely on it for preventing unexpected font injections.
To protect developers and existing apps from a risk of font injection,
stop loading font from other package's resouce unless the developer
explicitly set CONTEXT_IGNORE_SECURITY.
Bug:
62813533
Bug:
62879353
Test: Manually done
Merged-In: I4442ddc48dadb5c968b444be86038b602074d301
Change-Id: I4442ddc48dadb5c968b444be86038b602074d301
(cherry picked from commit
6d6cd68660635d670b0cb17f348b7c1da13704b3)
Bill Yi [Fri, 23 Jun 2017 07:43:50 +0000 (00:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib851156b7d64c1f1c3ea398dc1d80602219d2c0f
Auto-generated-cl: translation import
Bill Yi [Fri, 23 Jun 2017 07:39:00 +0000 (00:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iadf46b732ac29fc836edaf04a53062fb554a3b6a
Auto-generated-cl: translation import
Bill Yi [Fri, 23 Jun 2017 07:34:19 +0000 (00:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I01ea59f6895ce65a6e6a2749f0c99ec4ebbf947e
Auto-generated-cl: translation import
Bill Yi [Fri, 23 Jun 2017 05:35:07 +0000 (22:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I78bf0588f7daa39637f7e64922fad7081229d0a3
Auto-generated-cl: translation import
Yohei Yukawa [Fri, 23 Jun 2017 05:30:45 +0000 (22:30 -0700)]
Remove a redundant synchronized block
This CL removes a redundant synchronized block, which was accidentally
added in the previous CL [1] that simplified
TextServicesManagerService (TSMS) by using RemoteCallbackList<E>.
Since SpellCheckerBindGroup#removeListener() internally acquires the
lock on TSMS#mSpellCheckerMap, there is no need to acquire the same
lock in the caller.
This CL is just a mechanical clean-up. No behavior change is intended.
[1]: I38942765ed6bec6713757b1d5f325e7a633c2ba7
f982e75a262db16e60fd3565638d399315dba761
Bug:
35102403
Test: compile
Change-Id: I6d47e8cb6e301286bcb26922b74ee7cac2c5c1c5
Winson Chung [Fri, 23 Jun 2017 05:24:01 +0000 (05:24 +0000)]
Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev
am:
cd73cc4c6d
Change-Id: I380e262ab207e06b8a07b210d47cbc1294ba26f0
Bill Yi [Fri, 23 Jun 2017 05:23:09 +0000 (22:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8aa17b5012c0aee8f9c7141c09be040e8538833f
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 23 Jun 2017 05:16:08 +0000 (05:16 +0000)]
Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev
Daniel Nishi [Fri, 23 Jun 2017 04:40:53 +0000 (04:40 +0000)]
Merge "Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev am:
f14c1e12cf am:
41b743d8ad" into oc-dr1-dev-plus-aosp
am:
17c78a1e6b
Change-Id: If88fde815c8e25c6316ca01c162311555a99c322
Daniel Nishi [Fri, 23 Jun 2017 04:37:15 +0000 (04:37 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev am:
f14c1e12cf am:
58ad534db8
am:
c91e446b63
Change-Id: I8f746a8541d1c6c0eaa8b798e7c201eedfeb9389
Roshan Pius [Fri, 23 Jun 2017 04:33:13 +0000 (04:33 +0000)]
Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev
am:
db11f55cb7
Change-Id: I9131d29ad8e192e7af7c596fb5d954e040adb968
Android Build Merger (Role) [Fri, 23 Jun 2017 04:31:45 +0000 (04:31 +0000)]
Merge "Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev am:
f14c1e12cf am:
41b743d8ad" into oc-dr1-dev-plus-aosp
Daniel Nishi [Fri, 23 Jun 2017 04:28:41 +0000 (04:28 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev am:
f14c1e12cf
am:
58ad534db8
Change-Id: Ibef96b005e6227cd20c834b238f3561f2d7e218f
Daniel Nishi [Fri, 23 Jun 2017 04:28:37 +0000 (04:28 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev am:
f14c1e12cf
am:
41b743d8ad
Change-Id: Ie55bd4b478a3ca4ea475132ade37f03a0b9b4a00
TreeHugger Robot [Fri, 23 Jun 2017 04:26:45 +0000 (04:26 +0000)]
Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev
Seigo Nonaka [Fri, 23 Jun 2017 04:23:44 +0000 (04:23 +0000)]
Merge "Stop loading other package's font by default." into oc-dev
am:
824d75e0e1
Change-Id: I5518dbd8b5d8a4548ea00bbfca0e3aee87880ee7
Daniel Nishi [Fri, 23 Jun 2017 04:19:13 +0000 (04:19 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev
am:
f14c1e12cf
Change-Id: Ied7c80b4b9e58fa0d5b31e7a7bce33028e55337b
OSDN Git Service
