OSDN Git Service
Tom Cherry [Thu, 12 Oct 2017 21:12:17 +0000 (21:12 +0000)]
Merge "Move to some properties users to libbase properties" am:
2b20612e77
am:
9e4bfdb0b6
Change-Id: I1cd464a95fbcfbb172766412e26207eef34b6dd5
Tom Cherry [Thu, 12 Oct 2017 21:01:53 +0000 (21:01 +0000)]
Merge "Move to some properties users to libbase properties"
am:
2b20612e77
Change-Id: I376b9179ed242810c529d289558a44b422c1e8f5
Tom Cherry [Thu, 12 Oct 2017 20:47:18 +0000 (20:47 +0000)]
Merge "Move to some properties users to libbase properties"
Pengquan Meng [Thu, 12 Oct 2017 18:35:54 +0000 (18:35 +0000)]
Merge "MSIM: Fix to show PUK view when two sims locked on PIN." am:
00644ec5cc
am:
98eb4a23b5
Change-Id: I51e91e8cd3668d78d84c101848c02d6d99ea29c5
Pengquan Meng [Thu, 12 Oct 2017 18:26:47 +0000 (18:26 +0000)]
Merge "MSIM: Fix to show PUK view when two sims locked on PIN."
am:
00644ec5cc
Change-Id: Ic0b0927a52f2734cccff6f977aa0dfe9cd6e8d5c
Shawn [Thu, 12 Oct 2017 18:14:45 +0000 (18:14 +0000)]
Merge "DO NOT MERGE Update demo mode time to 8:00 for Android 8.0" am:
afc4e370cd -s ours
am:
bad318fc93 -s ours
Change-Id: I193fb2a306051a686ca7699e419372c86dde3a25
Pengquan Meng [Thu, 12 Oct 2017 18:10:37 +0000 (18:10 +0000)]
Merge "MSIM: Fix to show PUK view when two sims locked on PIN."
Shawn [Thu, 12 Oct 2017 18:08:39 +0000 (18:08 +0000)]
Merge "DO NOT MERGE Update demo mode time to 8:00 for Android 8.0"
am:
afc4e370cd -s ours
Change-Id: I3fa8d25130022abb4b5d0e39c0fc149ec2190604
Treehugger Robot [Thu, 12 Oct 2017 18:00:06 +0000 (18:00 +0000)]
Merge "DO NOT MERGE Update demo mode time to 8:00 for Android 8.0"
Shawn [Thu, 12 Oct 2017 02:55:43 +0000 (22:55 -0400)]
DO NOT MERGE Update demo mode time to 8:00 for Android 8.0
Change-Id: I6162889c3859d007629226be2a47a6276807aec0
Tom Cherry [Wed, 11 Oct 2017 20:44:21 +0000 (13:44 -0700)]
Move to some properties users to libbase properties
The libcutils interface cannot read properties with value length > 92
characters, whereas the libbase one can. ro.build.fingerprint may be
larger than this size in the future, so we move to libbase to prepare.
Bug:
23102347
Bug:
34954705
Test: build
Change-Id: Ic91aa63c7db1a7a01b9a1ee321b7854a9bcf6d12
Hugo Benichi [Thu, 12 Oct 2017 12:22:33 +0000 (12:22 +0000)]
Merge "Import a few android.net unit tests into frameworks-net" am:
24660e5bb7
am:
1ce75f643c
Change-Id: I9e2623e85bff3ca39738644a4b9d7abc216f52b8
Hugo Benichi [Thu, 12 Oct 2017 12:13:20 +0000 (12:13 +0000)]
Merge "Import a few android.net unit tests into frameworks-net"
am:
24660e5bb7
Change-Id: I41655938d6d1df19130847210437f047c8b65cdf
Hugo Benichi [Thu, 12 Oct 2017 11:58:32 +0000 (11:58 +0000)]
Merge "Import a few android.net unit tests into frameworks-net"
Hugo Benichi [Thu, 12 Oct 2017 09:33:41 +0000 (09:33 +0000)]
Merge "Migrate most of core networking tests to junit4" am:
9d456cd9c6
am:
7d9588c836
Change-Id: I3a02bcf20f59c2a07b7c920707cf6cde0bf68478
Hugo Benichi [Thu, 12 Oct 2017 09:24:40 +0000 (09:24 +0000)]
Merge "Migrate most of core networking tests to junit4"
am:
9d456cd9c6
Change-Id: Ib124efb327bfbacd5a637753f9c9724e27a218cb
Treehugger Robot [Thu, 12 Oct 2017 09:06:24 +0000 (09:06 +0000)]
Merge "Migrate most of core networking tests to junit4"
Hugo Benichi [Thu, 12 Oct 2017 00:54:49 +0000 (09:54 +0900)]
Import a few android.net unit tests into frameworks-net
Bug:
62918393
Test: runtest frameworks-net
Change-Id: I3c7c60bcfeffec5c5ec287810312349237a2868a
Hugo Benichi [Wed, 11 Oct 2017 02:26:25 +0000 (11:26 +0900)]
Migrate most of core networking tests to junit4
This patch is a batch of mechanical changes to test classes to migrate
away from AndroidTestCase and TestCase.
Bug:
62918393
Test: runtest frameworks-net
Change-Id: I74134609e511f22c4d9ecd65780e981f9ba7ae3f
Pengquan Meng [Thu, 12 Oct 2017 00:43:33 +0000 (17:43 -0700)]
MSIM: Fix to show PUK view when two sims locked on PIN.
Currently when both sims are locked on PIN, upon exhausting
PIN attempts for SIM1 PIN, SIM1 PUK view is not displayed
and the user is not able to unlock the PUK.
This is due to while fetching the getSecurityMode in Key
-GuardSecurityModel, the ordering of checking the security
mode is PIN first and PUK later.So when one sim is locked
on PUK and the other is locked on PIN the ordering of checking
the PIN first is causing to return PIN as security mode in place
of PUK. This will lead to PUK lock screen not been shown to user.
Fix: In KeyGuardSecurityModel.java, while querying the security Mode
modify the order to check for security mode i.e PUK locked state first
and then PIN locked state.
In KeyGuardSimPinView and KeyGuardSimPukView, check for sim locked on
PIN and reset the flags to show the default message.
Test: manually test
Bug:
34796244
Change-Id: I157959d9eb313b9d3af84f86e1429448a0f7f065
Hall Liu [Wed, 11 Oct 2017 23:41:30 +0000 (23:41 +0000)]
Merge "Fix URI unparceling and clarify an error condition" am:
5f123e6ad6
am:
1c36619f5b
Change-Id: Ibdc1ed0f0d432d0b47082195229001ca7174f3ef
Hall Liu [Wed, 11 Oct 2017 23:28:42 +0000 (23:28 +0000)]
Merge "Fix URI unparceling and clarify an error condition"
am:
5f123e6ad6
Change-Id: Ib8023d966e01fd2acefc464d8d25ed5030cfd85b
Jeff Sharkey [Wed, 11 Oct 2017 23:15:40 +0000 (23:15 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7 am:
92d80b72aa am:
d6e3d358d4 -s ours am:
bbcb8e4976
am:
753a9ab308
Change-Id: I73681573fc302c587490df16c214ee05049be7c6
Hall Liu [Wed, 11 Oct 2017 23:04:58 +0000 (23:04 +0000)]
Merge "Fix URI unparceling and clarify an error condition"
Jeff Sharkey [Wed, 11 Oct 2017 23:00:01 +0000 (23:00 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224 am:
44adace6c6 am:
af93051ac4 -s ours am:
620c5cfda0
am:
e286f08000
Change-Id: Ia728bbde02794482c1878089955179b4719e9bd9
Jeff Sharkey [Wed, 11 Oct 2017 22:51:13 +0000 (22:51 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7 am:
92d80b72aa am:
d6e3d358d4 -s ours
am:
bbcb8e4976
Change-Id: I924de4599fbf76a83d06cc6e0982bd73067c033a
Brad Ebinger [Wed, 11 Oct 2017 22:39:14 +0000 (22:39 +0000)]
Merge "Add new Download Error Codes" am:
e9bd5449b5
am:
946ff79971
Change-Id: I756df5c78a96a59468f54ac35e9668d66cf64901
Jeff Sharkey [Wed, 11 Oct 2017 22:35:46 +0000 (22:35 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224 am:
44adace6c6 am:
af93051ac4 -s ours
am:
620c5cfda0
Change-Id: I07805d81dbcf65993d5dcb695d9877ad4a914bac
Jeff Sharkey [Wed, 11 Oct 2017 22:35:01 +0000 (22:35 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7 am:
92d80b72aa
am:
d6e3d358d4 -s ours
Change-Id: Iece9faf3d2cbef432450c053d6440d94053bbb00
Jeff Sharkey [Wed, 11 Oct 2017 22:27:31 +0000 (22:27 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7
am:
92d80b72aa
Change-Id: I872a35e35cf8a997108daad39447bbad36ccfcaf
Brad Ebinger [Wed, 11 Oct 2017 22:24:58 +0000 (22:24 +0000)]
Merge "Add new Download Error Codes"
am:
e9bd5449b5
Change-Id: I8fa3c3dcc5104a5326a680ae186c9285a7e47358
Jeff Sharkey [Wed, 11 Oct 2017 22:23:16 +0000 (22:23 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224 am:
44adace6c6
am:
af93051ac4 -s ours
Change-Id: I93ce23ee4d45491a79346d11aed2cdb0fed0ef9f
Android Build Merger (Role) [Wed, 11 Oct 2017 22:14:32 +0000 (22:14 +0000)]
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a am:
97f6a0da40 -s ours am:
3b47256ccf am:
a7f0504849" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Wed, 11 Oct 2017 22:12:39 +0000 (22:12 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224
am:
44adace6c6
Change-Id: I3d0c489f0a6b3522f93b6d3b4db7892d081dc11c
Brad Ebinger [Wed, 11 Oct 2017 22:12:26 +0000 (22:12 +0000)]
Merge "Add new Download Error Codes"
Jeff Sharkey [Wed, 11 Oct 2017 22:11:57 +0000 (22:11 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb
am:
f1f2a61fb7
Change-Id: Ib999a03b6b52d8ca7446b1db6450578bab50d5d9
Jeff Sharkey [Wed, 11 Oct 2017 22:11:49 +0000 (22:11 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a am:
97f6a0da40 -s ours am:
3b47256ccf
am:
a7f0504849
Change-Id: I08b0a31acd8044b1fb1676052f853bbc1b1201a1
Dan Albert [Wed, 11 Oct 2017 22:07:46 +0000 (22:07 +0000)]
Merge "Add missing includes." am:
4be4bb3db7
am:
41c08f49b4
Change-Id: I67b30cd624fe42521097c20cc45ee6db19c0d43e
Jeff Sharkey [Wed, 11 Oct 2017 22:00:35 +0000 (22:00 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853
am:
7512875224
Change-Id: I55e255c4089089403a327cb0e24f750b5b9975ec
Dan Albert [Wed, 11 Oct 2017 21:52:41 +0000 (21:52 +0000)]
Merge "Add missing includes."
am:
4be4bb3db7
Change-Id: Icdae2b63df8e5d61e6acabb6fb85efa28026d535
Jeff Sharkey [Wed, 11 Oct 2017 21:52:08 +0000 (21:52 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a am:
97f6a0da40 -s ours
am:
3b47256ccf
Change-Id: Ie321b5922ec83367ec93e528993fb205ebcad1ac
Jeff Sharkey [Wed, 11 Oct 2017 21:51:37 +0000 (21:51 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571
am:
300e6ffafb
Change-Id: Iaef9ffa2cdfd6cf424fa22e554df3a0ea4d3e41f
Jeff Sharkey [Wed, 11 Oct 2017 21:41:50 +0000 (21:41 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7
am:
8860624853
Change-Id: Iea7736cd9e60673296bd39377393fa785bd58b17
Treehugger Robot [Wed, 11 Oct 2017 21:37:28 +0000 (21:37 +0000)]
Merge "Add missing includes."
Jeff Sharkey [Wed, 11 Oct 2017 21:36:45 +0000 (21:36 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c am:
b4d23d55c2 am:
e1ae848970 -s ours am:
7f108b81b3
am:
4a71a2daf6
Change-Id: I0fef13605c0a2da1b787bc11ac4ec06926665ba2
Jeff Sharkey [Wed, 11 Oct 2017 21:34:52 +0000 (21:34 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours
am:
ba1f2d2571
Change-Id: Ie72b8e52cd8717ac87d90627c1f53cbe2261c5e5
Jeff Sharkey [Wed, 11 Oct 2017 21:34:24 +0000 (21:34 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a
am:
97f6a0da40 -s ours
Change-Id: Icd0d048be2d037fa19befb94ccd8d6fda26bee74
Jeff Sharkey [Wed, 11 Oct 2017 21:24:41 +0000 (21:24 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c
am:
da3d10591a
Change-Id: I22ddd0fb81ca1acdb070a5872b4c0a31e197e15b
Jeff Sharkey [Wed, 11 Oct 2017 21:24:00 +0000 (21:24 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours
am:
e9d2113af7
Change-Id: Id1d09fd582e8a213f49e215af708291dfc76bb78
Jeff Sharkey [Wed, 11 Oct 2017 21:20:52 +0000 (21:20 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63
am:
8916c30c54 -s ours
Change-Id: Ia94b157d80bec5c24616af67c19bbceb0c384c36
Jeff Sharkey [Wed, 11 Oct 2017 21:19:01 +0000 (21:19 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am:
31c5adc279
am:
3f671b3194
Change-Id: I9abdd6f2df64398385a98686d66c4c043939adc6
Jeff Sharkey [Wed, 11 Oct 2017 21:18:21 +0000 (21:18 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c am:
b4d23d55c2 am:
e1ae848970 -s ours
am:
7f108b81b3
Change-Id: I87e6ae95c5a4be28cd268bac73548de83cf61ed6
Jeff Sharkey [Wed, 11 Oct 2017 21:12:09 +0000 (21:12 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0
am:
72df97053c
Change-Id: I62e502ebc6ac642cac7165ce1ce0982675362ab3
Jeff Sharkey [Wed, 11 Oct 2017 21:04:06 +0000 (21:04 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am:
09984216e6 -s ours am:
5f17a285f9
am:
98371ee7c9
Change-Id: I02c6f8314289abbc0639c634c478f293ecd1d679
Jeff Sharkey [Wed, 11 Oct 2017 21:00:20 +0000 (21:00 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c am:
b4d23d55c2
am:
e1ae848970 -s ours
Change-Id: Ic511d47f88b86fa999beae0363da07ee4fc1a3be
Jeff Sharkey [Wed, 11 Oct 2017 20:59:51 +0000 (20:59 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee
am:
e62d479921 -s ours
Change-Id: I1bc814da2ad8f108189d7f2293bf373b04434257
Jeff Sharkey [Wed, 11 Oct 2017 20:58:32 +0000 (20:58 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c
am:
5d60a49d63
Change-Id: I1b0f66ccf915436637a804ff0517c431b2813ec8
Jeff Sharkey [Wed, 11 Oct 2017 20:57:08 +0000 (20:57 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev
am:
31c5adc279
Change-Id: Id9a5a0216f1f26e059df45cc866582fe04cdf47d
Jeff Sharkey [Wed, 11 Oct 2017 20:47:31 +0000 (20:47 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a
am:
4a60106aa0
Change-Id: Iaace5d103229b9028d1b81602107af35857ca55c
Jeff Sharkey [Wed, 11 Oct 2017 20:47:31 +0000 (20:47 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c
am:
b4d23d55c2
Change-Id: Idfcdf295be77c9ab39d790e7793d2d772c92f9f7
Jeff Sharkey [Wed, 11 Oct 2017 20:46:21 +0000 (20:46 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am:
09984216e6 -s ours
am:
5f17a285f9
Change-Id: I9971bfff1c0792f78e4afe17a101ba6e6ae0cd2f
Jeff Sharkey [Wed, 11 Oct 2017 20:44:45 +0000 (20:44 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9
am:
d20cad62ee
Change-Id: Iaee355315a29be72ffd670178f88510aacdfc042
Jeff Sharkey [Wed, 11 Oct 2017 20:42:42 +0000 (20:42 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9
am:
7555eb508c
Change-Id: Ida6bf3d99469b443d6312066497ddb067569cd1d
Jeff Sharkey [Wed, 11 Oct 2017 20:34:50 +0000 (20:34 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev
am:
9d3706046c
Change-Id: I46ef6e731af52bd7404e580f85611804abb8bcef
Jeff Sharkey [Wed, 11 Oct 2017 20:34:48 +0000 (20:34 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev
am:
254369967a
Change-Id: I511e6d122a5717b36ad78d8100ed728ef862adff
TreeHugger Robot [Wed, 11 Oct 2017 20:34:39 +0000 (20:34 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev
Jeff Sharkey [Wed, 11 Oct 2017 20:32:40 +0000 (20:32 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am:
04b96d76a9
Change-Id: Ie2ae7f5071a534e1245c92293014963c8e4187ca
Jeff Sharkey [Wed, 11 Oct 2017 20:31:35 +0000 (20:31 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am:
d87d2746a9
Change-Id: Ia5455efc69556e5a52b1cc945e99b2ef51fdcd23
Jeff Sharkey [Wed, 11 Oct 2017 20:30:25 +0000 (20:30 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev
am:
09984216e6 -s ours
Change-Id: I3dcf7d6fdf11a8ed82d6f2362a18b12afaff1120
TreeHugger Robot [Wed, 11 Oct 2017 20:23:53 +0000 (20:23 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev
TreeHugger Robot [Wed, 11 Oct 2017 20:23:33 +0000 (20:23 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev
TreeHugger Robot [Wed, 11 Oct 2017 20:22:22 +0000 (20:22 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev
Bill Yi [Wed, 11 Oct 2017 20:17:36 +0000 (20:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
e721fbddb5 -s ours
am:
1018a5d4a1 -s ours
Change-Id: Iee62f36c79ce3056bf3b100251bd78e760655718
Bill Yi [Wed, 11 Oct 2017 20:09:44 +0000 (20:09 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
e721fbddb5 -s ours
Change-Id: Ic2a012410d13daece6049836eb20f1109011a4a6
TreeHugger Robot [Wed, 11 Oct 2017 19:59:02 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Wed, 11 Oct 2017 19:47:28 +0000 (19:47 +0000)]
Import translations. DO NOT MERGE am:
757057a5b5 -s ours am:
6fd592553c -s ours am:
fcde0eda85 -s ours
am:
bb04ab9aa1 -s ours
Change-Id: I66453d66b491ecff9aacc7fd53eece6e0e1ea351
Dan Albert [Wed, 11 Oct 2017 19:41:26 +0000 (12:41 -0700)]
Add missing includes.
Test: mma
Bug: None
Change-Id: Iec8b0a7854091946a4bb6e804c5f4cce39a52b47
Bill Yi [Wed, 11 Oct 2017 19:37:05 +0000 (19:37 +0000)]
Import translations. DO NOT MERGE am:
757057a5b5 -s ours am:
6fd592553c -s ours
am:
fcde0eda85 -s ours
Change-Id: I68381bf426aedbb2a0bb365364f7462ab3bdb585
Bill Yi [Wed, 11 Oct 2017 19:27:42 +0000 (19:27 +0000)]
Import translations. DO NOT MERGE am:
757057a5b5 -s ours
am:
6fd592553c -s ours
Change-Id: I2488e81c41395d3aedf20f02f61dfb9f67c5aa29
Bill Yi [Wed, 11 Oct 2017 19:20:06 +0000 (19:20 +0000)]
Import translations. DO NOT MERGE
am:
757057a5b5 -s ours
Change-Id: I35b629a43daf6ef991fc4ec61a4aba933cad0ae2
Colin Cross [Wed, 11 Oct 2017 18:45:37 +0000 (18:45 +0000)]
Merge "Convert libjnigraphics to Android.bp" am:
006c167544
am:
2fbccabbca
Change-Id: I7fea93c95baee3812fdf48805bb883e3afd172c1
Colin Cross [Wed, 11 Oct 2017 18:37:19 +0000 (18:37 +0000)]
Merge "Convert libjnigraphics to Android.bp"
am:
006c167544
Change-Id: Ic07a49510c946104f74ad72a830aed9696a2ddd6
Colin Cross [Wed, 11 Oct 2017 18:18:45 +0000 (18:18 +0000)]
Merge "Convert libjnigraphics to Android.bp"
Jordan Liu [Wed, 11 Oct 2017 16:41:01 +0000 (16:41 +0000)]
Merge "Add MM#6 string overlay" am:
b53262c148
am:
939db64461
Change-Id: Id85dd22241293b0f77b4d70e8f3391b6d4048f46
Jordan Liu [Wed, 11 Oct 2017 16:31:10 +0000 (16:31 +0000)]
Merge "Add MM#6 string overlay"
am:
b53262c148
Change-Id: I1cbdba97bba4e0074c60ce374978ffb0b0cca8de
Jordan Liu [Wed, 11 Oct 2017 16:15:39 +0000 (16:15 +0000)]
Merge "Add MM#6 string overlay"
Andreas Gampe [Wed, 11 Oct 2017 16:09:36 +0000 (16:09 +0000)]
Merge "EventLogHelper: Clean up code" am:
386a5687dd
am:
9b24969314
Change-Id: I7eb8083e7471f2fff528c049ef7cdf2d20da4e24
Andreas Gampe [Wed, 11 Oct 2017 16:00:51 +0000 (16:00 +0000)]
Merge "EventLogHelper: Clean up code"
am:
386a5687dd
Change-Id: Id2bfdb49859d9ad62e733b8037e27b54bbdb3537
Treehugger Robot [Wed, 11 Oct 2017 15:48:46 +0000 (15:48 +0000)]
Merge "EventLogHelper: Clean up code"
Erik Kline [Wed, 11 Oct 2017 13:03:02 +0000 (13:03 +0000)]
Merge "IpManager: add display name for helpful logging, and Network" am:
ed0b030e17
am:
d0c68dec76
Change-Id: Ie650f985c17d16e972e43e66653561200d2e4ef2
Erik Kline [Wed, 11 Oct 2017 12:52:23 +0000 (12:52 +0000)]
Merge "IpManager: add display name for helpful logging, and Network"
am:
ed0b030e17
Change-Id: I9b5fb4b995e351dfed74bfe83993e379c87305d6
Treehugger Robot [Wed, 11 Oct 2017 12:42:41 +0000 (12:42 +0000)]
Merge "IpManager: add display name for helpful logging, and Network"
Erik Kline [Wed, 4 Oct 2017 11:28:54 +0000 (20:28 +0900)]
IpManager: add display name for helpful logging, and Network
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
62476366
Change-Id: I509506814fa704e54f3d67158203276312a24fa1
Bill Yi [Wed, 11 Oct 2017 07:21:44 +0000 (00:21 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I9b8f913edd4d61427600f47c91644750e6dff3c5
Erik Kline [Wed, 11 Oct 2017 04:17:50 +0000 (04:17 +0000)]
Merge "Log upstream network suspend/resume callbacks" am:
645cd2ad26
am:
cc92587976
Change-Id: I6e2fe9d6e9a030eaee8ed359b630f2a81a833ae3
Erik Kline [Wed, 11 Oct 2017 04:08:55 +0000 (04:08 +0000)]
Merge "Log upstream network suspend/resume callbacks"
am:
645cd2ad26
Change-Id: I375e47a21d2fc6a5e67ff6367087c22beceb6377
Treehugger Robot [Wed, 11 Oct 2017 04:00:16 +0000 (04:00 +0000)]
Merge "Log upstream network suspend/resume callbacks"
Erik Kline [Tue, 10 Oct 2017 02:54:08 +0000 (11:54 +0900)]
Log upstream network suspend/resume callbacks
Also log signal strength while we're at it:
2017-10-10T14:05:00.968 - [UpstreamNetworkMonitor] preferred upstream type: WIFI
2017-10-10T14:06:07.654 - [UpstreamNetworkMonitor] upstream network signal strength: -62 -> -67
2017-10-10T14:06:13.704 - [UpstreamNetworkMonitor] upstream network signal strength: -67 -> -64
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Bug:
64976634
Bug:
67396342
Merged-In: I9121798bba0be9dcdf1e45d39c092020620fa53b
Merged-In: I1d3420380691efd886315275598134b98f4041ed
Change-Id: Id6e143edc9f5b0256aa637643680f6c8dce70d90
(cherry picked from commit
60caf7d29132262dd4a077b68daa807d22773524)
Hall Liu [Wed, 11 Oct 2017 02:08:24 +0000 (19:08 -0700)]
Fix URI unparceling and clarify an error condition
Use the proper unparceling method for lists, add a more verbose
exception for when the app fails to declare a critical piece of
metadata.
Change-Id: I29d5291d7b88476496334d268be94f7f8c08255c
Fixes:
67640653
Test: manual, with testapp
Bill Yi [Tue, 10 Oct 2017 22:31:12 +0000 (15:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4d38b1392fb97117f7a403a224fc65a871dcea19
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
OSDN Git Service
