OSDN Git Service

android-x86/frameworks-base.git
6 years agoDO NOT MERGE: Add unit tests to ensure VPN meteredness
Benedict Wong [Tue, 20 Feb 2018 23:19:59 +0000 (15:19 -0800)]
DO NOT MERGE: Add unit tests to ensure VPN meteredness

These new tests ensure that VPNs report the meteredness of their
underlying networks correctly. The added test verifies VPN meteredness
for cases of metered and unmetered WiFi and Cell

Bug: 78644887
Test: This; ran on walleye-eng
Change-Id: I28bdc71a336bfd97f7908455d4781d774df44b87

6 years agoDO NOT MERGE: Fix ConnectivityController meteredness checks
Benedict Wong [Fri, 4 May 2018 04:07:58 +0000 (21:07 -0700)]
DO NOT MERGE: Fix ConnectivityController meteredness checks

This patch corrects ConnectivityController's meteredness checks to
perform correct meteredness checks while VPNs are running. This fixes a
bug in O-MR1 where any apps using the DownloadProvider with unmetered
network constraints fail to start while the VPN is enabled.

This change adds a bespoke method for ConnectivityController, allowing
it to correctly identify the meteredness without affecting public API
surfaces.

Bug: 78644887
Test: Built, flashed on Walleye, and tested.
Test: Additional test coverage in subsequent patch(es).
Change-Id: Ie1d11d93d51d936ce81cd5984af61bde30325983

6 years agoMerge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am...
Bill Yi [Mon, 21 May 2018 17:28:44 +0000 (10:28 -0700)]
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am: 99e6aa1b1e
am: d88c6877da

Change-Id: I0acd60a59fcb928752ce7bf952bbfe9f65b68ff4

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped...
Bill Yi [Mon, 21 May 2018 17:24:41 +0000 (10:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477 am: 4f1f428661  -s ours
am: a53d91e485  -s ours

Change-Id: Ife13f7c8262521ddc28deb4ceaf5b27b9765c792

6 years agoMerge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev
Bill Yi [Mon, 21 May 2018 17:19:31 +0000 (10:19 -0700)]
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev
am: 99e6aa1b1e

Change-Id: Id35ca83236112898b4e39b3cb173be70c435168f

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped...
Bill Yi [Mon, 21 May 2018 17:17:56 +0000 (10:17 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477
am: 4f1f428661  -s ours

Change-Id: Iac8c22f36859d6648ae856236c9a97080238cae5

6 years agoMerge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev
TreeHugger Robot [Mon, 21 May 2018 17:03:49 +0000 (17:03 +0000)]
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477
  [automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb
  Import translations. DO NOT MERGE

6 years agoMerge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev am...
Bill Yi [Fri, 18 May 2018 01:14:50 +0000 (18:14 -0700)]
Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev am: abf0ff542a
am: 4d58eb3bc1

Change-Id: I9bdbdaadbe40bba74e9ca9186e88d6881c25e022

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927 skipped...
Bill Yi [Fri, 18 May 2018 01:09:52 +0000 (18:09 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927 skipped: 43bd9fa8b2 am: f028e75015  -s ours
am: c22431c753  -s ours

Change-Id: I186355d9122a1eb12b968ff05e91a631f1189b45

6 years agoMerge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into oc-dev am...
Bill Yi [Fri, 18 May 2018 01:03:39 +0000 (18:03 -0700)]
Merge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into oc-dev am: c844ea5c96
am: 44042a74c7

Change-Id: I39a0f64a8a2cb75fee5d9caf50c249f43637762f

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0 skipped...
Bill Yi [Fri, 18 May 2018 00:58:50 +0000 (17:58 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0 skipped: ead9437423 am: f3df46779d  -s ours
am: 2fe6455d18  -s ours

Change-Id: Iddb6db689a98d1f569e79da1a96d716c49cdd5e0

6 years agoMerge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into oc-dev am...
Bill Yi [Fri, 18 May 2018 00:52:28 +0000 (17:52 -0700)]
Merge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into oc-dev am: a86ba9b6e5
am: 7c05674594

Change-Id: I8da971740edb6e110fc02bc5ae4e92a3072b3637

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96 skipped...
Bill Yi [Fri, 18 May 2018 00:47:23 +0000 (17:47 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96 skipped: 913239f688 am: 1c6bdf5174  -s ours
am: a1df530ac7  -s ours

Change-Id: I06393327f4c6cfd8c5c6e4e17d19e2b21817b040

6 years agoMerge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev am...
Bill Yi [Fri, 18 May 2018 00:41:19 +0000 (17:41 -0700)]
Merge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev am: 70060539aa
am: aaddf187e4

Change-Id: I674bd5be030c34e37443c8746c40bcae2704e1b2

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2 skipped...
Bill Yi [Fri, 18 May 2018 00:35:54 +0000 (17:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2 skipped: a492d4d55b am: 6959e2b475  -s ours
am: eef34578b3  -s ours

Change-Id: Ic0a169bd1c11dec7e4bcc8d7a8a2a9ba30d72a6b

6 years agoMerge changes from topic "am-d375c8a9-01d8-44da-9ef2-2e866e457b89" into oc-dev am...
Bill Yi [Fri, 18 May 2018 00:29:10 +0000 (17:29 -0700)]
Merge changes from topic "am-d375c8a9-01d8-44da-9ef2-2e866e457b89" into oc-dev am: e936691bfc
am: 1ea636faa9

Change-Id: I26d60740cd9afc04529a9fb431786c7829ef84f6

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped...
Bill Yi [Fri, 18 May 2018 00:23:00 +0000 (17:23 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped: a98b588532 am: 1221af165e  -s ours
am: aa961b929b  -s ours

Change-Id: Ic0790355c37d9f3501b519dc773466a53f41b3cc

6 years agoMerge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-dev am...
Bill Yi [Fri, 18 May 2018 00:10:29 +0000 (17:10 -0700)]
Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-dev am: ea5a5f49cc
am: 5897727afc

Change-Id: I9fa868feb79839c8090ba44901c09602d48a00d9

6 years agoMerge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev
Bill Yi [Fri, 18 May 2018 00:09:03 +0000 (17:09 -0700)]
Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev
am: abf0ff542a

Change-Id: Id3b645350fefaee4071d56d6e4bd368fa535350e

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927 skipped...
Bill Yi [Fri, 18 May 2018 00:07:40 +0000 (17:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927 skipped: 43bd9fa8b2
am: f028e75015  -s ours

Change-Id: I7415cd61d98275b3d07e17efa2be8026a2a6b6d5

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d skipped...
Bill Yi [Fri, 18 May 2018 00:05:08 +0000 (17:05 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d skipped: e7c60be83f am: 4bfac58817  -s ours
am: 60682c726c  -s ours

Change-Id: I43fa56442b50d3935f9769de2fc22bcfb8f38f6f

6 years agoMerge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into oc-dev
Bill Yi [Fri, 18 May 2018 00:03:27 +0000 (17:03 -0700)]
Merge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into oc-dev
am: c844ea5c96

Change-Id: Iccd345fb289c4daae404186709dccd4e8fb67fd1

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0 skipped...
Bill Yi [Fri, 18 May 2018 00:01:48 +0000 (17:01 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0 skipped: ead9437423
am: f3df46779d  -s ours

Change-Id: I84b536b9e12331834feb59bbe3c58b554506f259

6 years agoMerge changes from topic "am-76a20f08-9212-4001-a52b-dd38a93faa9b" into oc-dev am...
Bill Yi [Thu, 17 May 2018 23:57:51 +0000 (16:57 -0700)]
Merge changes from topic "am-76a20f08-9212-4001-a52b-dd38a93faa9b" into oc-dev am: 9ede115c2b
am: 43539011e4

Change-Id: I64ee4058dd334bd0be975016361fa97c905a598d

6 years agoMerge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into oc-dev
Bill Yi [Thu, 17 May 2018 23:55:51 +0000 (16:55 -0700)]
Merge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into oc-dev
am: a86ba9b6e5

Change-Id: I46efd01a25ff71885d5573e28731593a1cebb865

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96 skipped...
Bill Yi [Thu, 17 May 2018 23:53:52 +0000 (16:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96 skipped: 913239f688
am: 1c6bdf5174  -s ours

Change-Id: If7d661f6e4fb7d74843ab3a948dba40b7349be55

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862 skipped...
Bill Yi [Thu, 17 May 2018 23:52:04 +0000 (16:52 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862 skipped: a7875e6a7d am: 81a6ef98f3  -s ours
am: 4fb03f2730  -s ours

Change-Id: I0eddfd0423b803df34e4134c294bb58bf165f688

6 years agoMerge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev
Bill Yi [Thu, 17 May 2018 23:48:54 +0000 (16:48 -0700)]
Merge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev
am: 70060539aa

Change-Id: I871256a76c3af4e37959f729389114c694e15596

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2 skipped...
Bill Yi [Thu, 17 May 2018 23:46:58 +0000 (16:46 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2 skipped: a492d4d55b
am: 6959e2b475  -s ours

Change-Id: I6951039ef2fc1a8770698c6da24944b3cb81ff2a

6 years agoMerge changes from topic "am-d1fbdf53-dccb-4215-99ff-b24698b6bec8" into oc-dev am...
Bill Yi [Thu, 17 May 2018 23:45:06 +0000 (16:45 -0700)]
Merge changes from topic "am-d1fbdf53-dccb-4215-99ff-b24698b6bec8" into oc-dev am: c6c611293d
am: b2f28267ad

Change-Id: If282600586310eb4dc03523f4883ff15ac2db651

6 years agoMerge changes from topic "am-d375c8a9-01d8-44da-9ef2-2e866e457b89" into oc-dev
Bill Yi [Thu, 17 May 2018 23:43:04 +0000 (16:43 -0700)]
Merge changes from topic "am-d375c8a9-01d8-44da-9ef2-2e866e457b89" into oc-dev
am: e936691bfc

Change-Id: I00cd12299a177549e980a01c5e8328306663bbee

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped...
Bill Yi [Thu, 17 May 2018 23:40:57 +0000 (16:40 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped: a98b588532
am: 1221af165e  -s ours

Change-Id: I87afb96b009dbc4bfbc152d5764bc8728f0b0fef

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 379dacd8c2 skipped...
Bill Yi [Thu, 17 May 2018 23:39:55 +0000 (16:39 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 379dacd8c2 skipped: 20306f6ce0 am: fb795ed727  -s ours
am: c31d960f5e  -s ours

Change-Id: I43fdbbc880a880f61b86a1f9e569f8c65196d65b

6 years agoMerge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-dev
Bill Yi [Thu, 17 May 2018 23:36:39 +0000 (16:36 -0700)]
Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-dev
am: ea5a5f49cc

Change-Id: Ib4683b9918a30e45b255e03b5dc5b38567b0bbe9

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d skipped...
Bill Yi [Thu, 17 May 2018 23:35:10 +0000 (16:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d skipped: e7c60be83f
am: 4bfac58817  -s ours

Change-Id: I910a028d8a4945d0dbbd6334b1d95fc85dd162a1

6 years agoMerge changes from topic "am-93ef86f6-d908-4917-b503-5ba7fcefcad8" into oc-dev am...
Bill Yi [Thu, 17 May 2018 23:34:41 +0000 (16:34 -0700)]
Merge changes from topic "am-93ef86f6-d908-4917-b503-5ba7fcefcad8" into oc-dev am: 5667f966e5
am: e2790f5d0f

Change-Id: Ifa350e4e880263f58b6eb5ade4fdee5427fcb08b

6 years agoMerge changes from topic "am-76a20f08-9212-4001-a52b-dd38a93faa9b" into oc-dev
Bill Yi [Thu, 17 May 2018 23:31:32 +0000 (16:31 -0700)]
Merge changes from topic "am-76a20f08-9212-4001-a52b-dd38a93faa9b" into oc-dev
am: 9ede115c2b

Change-Id: Ida64b0840ce3569aa8a3ca5bb82a08de30ba3a23

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: fc4347f98e skipped...
Bill Yi [Thu, 17 May 2018 23:30:03 +0000 (16:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: fc4347f98e skipped: 8b2ac4fffa am: a72fe6a957  -s ours
am: dc9639ab7f  -s ours

Change-Id: Ib6ede43f9ed266ca41dffc03cc26422471b2afe2

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862 skipped...
Bill Yi [Thu, 17 May 2018 23:29:55 +0000 (16:29 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862 skipped: a7875e6a7d
am: 81a6ef98f3  -s ours

Change-Id: I653ae63bef34f046ac9fc9be7d0e04d818dd0d89

6 years agoMerge changes from topic "am-d1fbdf53-dccb-4215-99ff-b24698b6bec8" into oc-dev
Bill Yi [Thu, 17 May 2018 23:26:51 +0000 (16:26 -0700)]
Merge changes from topic "am-d1fbdf53-dccb-4215-99ff-b24698b6bec8" into oc-dev
am: c6c611293d

Change-Id: I74ee0d6e477345487b6056b3e1f92a41ba67731f

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 379dacd8c2 skipped...
Bill Yi [Thu, 17 May 2018 23:25:01 +0000 (16:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 379dacd8c2 skipped: 20306f6ce0
am: fb795ed727  -s ours

Change-Id: Id3bd937bf2aecd644b6c5ec4de4d8707196267f5

6 years agoMerge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev
TreeHugger Robot [Thu, 17 May 2018 23:23:10 +0000 (23:23 +0000)]
Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927 skipped: 43bd9fa8b2
  [automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927
  Import translations. DO NOT MERGE

6 years agoMerge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into oc-dev
TreeHugger Robot [Thu, 17 May 2018 23:22:37 +0000 (23:22 +0000)]
Merge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0 skipped: ead9437423
  [automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0
  Import translations. DO NOT MERGE

6 years agoMerge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into oc-dev
TreeHugger Robot [Thu, 17 May 2018 23:21:49 +0000 (23:21 +0000)]
Merge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96 skipped: 913239f688
  [automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96
  Import translations. DO NOT MERGE

6 years agoMerge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev
TreeHugger Robot [Thu, 17 May 2018 23:20:31 +0000 (23:20 +0000)]
Merge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2 skipped: a492d4d55b
  [automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2
  Import translations. DO NOT MERGE

6 years agoMerge changes from topic "am-93ef86f6-d908-4917-b503-5ba7fcefcad8" into oc-dev
Bill Yi [Thu, 17 May 2018 23:20:16 +0000 (16:20 -0700)]
Merge changes from topic "am-93ef86f6-d908-4917-b503-5ba7fcefcad8" into oc-dev
am: 5667f966e5

Change-Id: Iba9987a2228227107c2870f2a57b4c132e3f6e3e

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: a52a0f49cc skipped...
Bill Yi [Thu, 17 May 2018 23:19:50 +0000 (16:19 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: a52a0f49cc skipped: a5619cc4e3 am: 19bf5aa466  -s ours
am: 22961acba1  -s ours

Change-Id: I945ab1ecad9290ba64bad8b93fe7614b9a9778ae

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: fc4347f98e skipped...
Bill Yi [Thu, 17 May 2018 23:18:59 +0000 (16:18 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: fc4347f98e skipped: 8b2ac4fffa
am: a72fe6a957  -s ours

Change-Id: I659644d1abcb04788c35591a290440e8a990e79c

6 years agoMerge changes from topic "am-d375c8a9-01d8-44da-9ef2-2e866e457b89" into oc-dev
TreeHugger Robot [Thu, 17 May 2018 23:17:54 +0000 (23:17 +0000)]
Merge changes from topic "am-d375c8a9-01d8-44da-9ef2-2e866e457b89" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped: a98b588532
  [automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc
  Import translations. DO NOT MERGE

6 years agoMerge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-dev
TreeHugger Robot [Thu, 17 May 2018 23:17:28 +0000 (23:17 +0000)]
Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d skipped: e7c60be83f
  [automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d
  Import translations. DO NOT MERGE

6 years agoMerge changes from topic "am-76a20f08-9212-4001-a52b-dd38a93faa9b" into oc-dev
TreeHugger Robot [Thu, 17 May 2018 23:16:59 +0000 (23:16 +0000)]
Merge changes from topic "am-76a20f08-9212-4001-a52b-dd38a93faa9b" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862 skipped: a7875e6a7d
  [automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862
  Import translations. DO NOT MERGE

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: a52a0f49cc skipped...
Bill Yi [Thu, 17 May 2018 23:15:13 +0000 (16:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: a52a0f49cc skipped: a5619cc4e3
am: 19bf5aa466  -s ours

Change-Id: I99a15ef8e43c65f65d99c83c27d8779bbf03f864

6 years agoMerge changes from topic "am-d1fbdf53-dccb-4215-99ff-b24698b6bec8" into oc-dev
TreeHugger Robot [Thu, 17 May 2018 23:11:49 +0000 (23:11 +0000)]
Merge changes from topic "am-d1fbdf53-dccb-4215-99ff-b24698b6bec8" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 379dacd8c2 skipped: 20306f6ce0
  [automerger skipped] Import translations. DO NOT MERGE skipped: 379dacd8c2
  Import translations. DO NOT MERGE

6 years agoMerge changes from topic "am-93ef86f6-d908-4917-b503-5ba7fcefcad8" into oc-dev
TreeHugger Robot [Thu, 17 May 2018 23:08:40 +0000 (23:08 +0000)]
Merge changes from topic "am-93ef86f6-d908-4917-b503-5ba7fcefcad8" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: fc4347f98e skipped: 8b2ac4fffa
  [automerger skipped] Import translations. DO NOT MERGE skipped: fc4347f98e
  Import translations. DO NOT MERGE

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0 skipped...
Android Build Merger (Role) [Thu, 17 May 2018 20:23:20 +0000 (20:23 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0 skipped: ead9437423

Change-Id: Ib205a2905687b5d141c6865096055ce1e2fc5695

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0
Android Build Merger (Role) [Thu, 17 May 2018 20:23:15 +0000 (20:23 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0

Change-Id: Ica203d86f848c960f78cbfc52f2a79235775b5ad

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 20:22:57 +0000 (13:22 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib520bacf1c72ef41ba41049a652c914aee6404a5
Auto-generated-cl: translation import

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: fc4347f98e skipped...
Android Build Merger (Role) [Thu, 17 May 2018 20:16:51 +0000 (20:16 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: fc4347f98e skipped: 8b2ac4fffa

Change-Id: If1028ada1c941503fb6019248df34e3746fcde2f

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: fc4347f98e
Android Build Merger (Role) [Thu, 17 May 2018 20:16:44 +0000 (20:16 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: fc4347f98e

Change-Id: I1f62a7df5e9abe4a14bb1f8dd746518935ad3799

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 20:16:22 +0000 (13:16 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iccdcf6f4eb7734618d1ac104ba2605c2b8eaed78
Auto-generated-cl: translation import

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped...
Android Build Merger (Role) [Thu, 17 May 2018 19:24:20 +0000 (19:24 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped: a98b588532

Change-Id: I72a76903d5f9206012fcd057330c697b87a2edd4

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc
Android Build Merger (Role) [Thu, 17 May 2018 19:24:14 +0000 (19:24 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc

Change-Id: I2175abb2fc2242262851b262cbfab21be2aea9f6

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 19:23:50 +0000 (12:23 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5f852d1e333ffb20b1ac78f84791fa7b4f9091f9
Auto-generated-cl: translation import

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862 skipped...
Android Build Merger (Role) [Thu, 17 May 2018 19:15:58 +0000 (19:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862 skipped: a7875e6a7d

Change-Id: I5c0b5c4beead842ea771083b8bb3a87d846b949f

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862
Android Build Merger (Role) [Thu, 17 May 2018 19:15:52 +0000 (19:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862

Change-Id: Id48d35e7d3e303142ce734b6fe8d120bc7a63900

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 19:15:29 +0000 (12:15 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8cd1fe0903685b95ef950bb675755fa3f9c0c61f
Auto-generated-cl: translation import

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d skipped...
Android Build Merger (Role) [Thu, 17 May 2018 19:03:57 +0000 (19:03 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d skipped: e7c60be83f

Change-Id: I0ed0c7b8695b336bfea20432f5795a15ba8afc63

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d
Android Build Merger (Role) [Thu, 17 May 2018 19:03:51 +0000 (19:03 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d

Change-Id: I0bc12ca3b01898ae0bd149dedd037105af6ba09f

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 19:03:25 +0000 (12:03 -0700)]
Import translations. DO NOT MERGE

Change-Id: I774c309761ed8d810d3eb5c7de2a6128e1b4e9c4
Auto-generated-cl: translation import

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96 skipped...
Android Build Merger (Role) [Thu, 17 May 2018 18:52:35 +0000 (18:52 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96 skipped: 913239f688

Change-Id: Ibbf4043cec321c85857285d48f353698582b5459

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96
Android Build Merger (Role) [Thu, 17 May 2018 18:52:30 +0000 (18:52 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96

Change-Id: I8fd53dd1550fedb867e6be3d0f425effcb35088b

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 18:52:07 +0000 (11:52 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia1520cd471548773369f3762ede13c07d12a7ed5
Auto-generated-cl: translation import

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 379dacd8c2 skipped...
Android Build Merger (Role) [Thu, 17 May 2018 18:44:45 +0000 (18:44 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 379dacd8c2 skipped: 20306f6ce0

Change-Id: I21ab563abd9c30724436723f6dfd5a3c5debba5f

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 379dacd8c2
Android Build Merger (Role) [Thu, 17 May 2018 18:44:38 +0000 (18:44 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 379dacd8c2

Change-Id: I3e8c7aca201fda9fcaaba88e196b49af85a50c9a

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 18:44:11 +0000 (11:44 -0700)]
Import translations. DO NOT MERGE

Change-Id: I84a155dad80243362cd12cf62074aaebfe4df759
Auto-generated-cl: translation import

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927 skipped...
Android Build Merger (Role) [Thu, 17 May 2018 18:31:08 +0000 (18:31 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927 skipped: 43bd9fa8b2

Change-Id: I180fdd83de2e38d6bed8b71665cc7e05c5770473

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927
Android Build Merger (Role) [Thu, 17 May 2018 18:31:02 +0000 (18:31 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927

Change-Id: Ib33139944063e2c0767efc8eaa97d12c2c12efa0

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 18:30:30 +0000 (11:30 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ibae57a609be5646f0051a175eb9e51894d36e4ec
Auto-generated-cl: translation import

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2 skipped...
Android Build Merger (Role) [Thu, 17 May 2018 18:10:57 +0000 (18:10 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2 skipped: a492d4d55b

Change-Id: I39ac9fd76292a6989b1651de6e7de591fe6541b3

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2
Android Build Merger (Role) [Thu, 17 May 2018 18:10:50 +0000 (18:10 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2

Change-Id: Ic51dccbd5c072e301a29a8c343d1d46d96f2dcfc

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 18:10:27 +0000 (11:10 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iede073582e79433f57a9df283536e33787b5d89f
Auto-generated-cl: translation import

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped...
Android Build Merger (Role) [Thu, 17 May 2018 18:04:20 +0000 (18:04 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477

Change-Id: Ibe7908b3e64dbe88c089010da4b2d03f0c14dde0

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb
Android Build Merger (Role) [Thu, 17 May 2018 18:04:15 +0000 (18:04 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb

Change-Id: I9d5c9958fe7c4bc4a8ef28f471e7a9bb4ce30ffd

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 18:03:51 +0000 (11:03 -0700)]
Import translations. DO NOT MERGE

Change-Id: Icd56351eb1ed607c64b62c6e0ada553078b6393d
Auto-generated-cl: translation import

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: a52a0f49cc skipped...
Android Build Merger (Role) [Thu, 17 May 2018 17:57:50 +0000 (17:57 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: a52a0f49cc skipped: a5619cc4e3

Change-Id: I56ff76335c44571f3df4c63f95970b97555cd9b4

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: a52a0f49cc
Android Build Merger (Role) [Thu, 17 May 2018 17:57:40 +0000 (17:57 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: a52a0f49cc

Change-Id: I7b718beb5044ad046eed73fc54950f724ee70a78

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 17:57:03 +0000 (10:57 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic6a4271d7a7e37cf847a3f8e920b9937885564fa
Auto-generated-cl: translation import

6 years ago[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e...
Tony Mak [Thu, 10 May 2018 20:39:43 +0000 (13:39 -0700)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360 am: 6a42ea18b3 am: 42ded39df8 am: fb67a0f5f3 am: 2cb239cf3c am: 8914d11b15 am: 675ad12059 am: ed2d7b7d62
am: e4204fa020

Change-Id: I4c1426d98c470490c9a62ca88bafbd5d5c62c09c

6 years ago[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e...
Tony Mak [Thu, 10 May 2018 20:28:09 +0000 (13:28 -0700)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360 am: 6a42ea18b3 am: 42ded39df8 am: fb67a0f5f3 am: 2cb239cf3c am: 8914d11b15 am: 675ad12059
am: ed2d7b7d62

Change-Id: Ibfff2e78a363925207bd6ea0364aa494f99fe6b3

6 years ago[automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f5...
Eugene Susla [Thu, 10 May 2018 20:20:16 +0000 (13:20 -0700)]
[automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 am: 9e291fe8c2 am: 97f7498c18 am: 232f42c7b8 am: 76a04ff670 am: 2bd91daa06 am: 3543522564
am: 775b8adf7b

Change-Id: I835e777e7e6bee5e91bfa729d095f8b6f0653c43

6 years ago[automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f5...
Eugene Susla [Thu, 10 May 2018 20:07:48 +0000 (13:07 -0700)]
[automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 am: 9e291fe8c2 am: 97f7498c18 am: 232f42c7b8 am: 76a04ff670 am: 2bd91daa06
am: 3543522564

Change-Id: I62fb1c7d3eb618e7f3d8b2033303761c5f75e9c8

6 years ago[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e...
Android Build Merger (Role) [Thu, 10 May 2018 17:41:07 +0000 (17:41 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360 am: 6a42ea18b3 am: 42ded39df8 am: fb67a0f5f3 am: 2cb239cf3c am: 8914d11b15 am: 675ad12059

Change-Id: I9435814e67948c466a6bebc7acdcb2e68b30d4be

6 years ago[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e...
Android Build Merger (Role) [Thu, 10 May 2018 17:41:03 +0000 (17:41 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360 am: 6a42ea18b3 am: 42ded39df8 am: fb67a0f5f3 am: 2cb239cf3c am: 8914d11b15

Change-Id: I72861a0685af1981b9a50ebbb8eb315d150f5f63

6 years ago[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e...
Android Build Merger (Role) [Thu, 10 May 2018 17:40:57 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360 am: 6a42ea18b3 am: 42ded39df8 am: fb67a0f5f3 am: 2cb239cf3c

Change-Id: I8f405684aae1cdb6aac377861d3387622a20f661

6 years ago[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e...
Android Build Merger (Role) [Thu, 10 May 2018 17:40:52 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360 am: 6a42ea18b3 am: 42ded39df8 am: fb67a0f5f3

Change-Id: I756b595747e3d97ddb14dc45ed1b6001ec6ebed8

6 years ago[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e...
Android Build Merger (Role) [Thu, 10 May 2018 17:40:46 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360 am: 6a42ea18b3 am: 42ded39df8

Change-Id: I315da9ccb85d9e69edf18dd85b7bdf183bd6f738

6 years ago[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e...
Android Build Merger (Role) [Thu, 10 May 2018 17:40:32 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360 am: 6a42ea18b3

Change-Id: If82fd8b2c76bedf089bec4501169417427854b1d

6 years ago[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e...
Android Build Merger (Role) [Thu, 10 May 2018 17:40:27 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360

Change-Id: I0e5ba8adaed2d6247137319262278fac98f467e1

6 years ago[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e...
Android Build Merger (Role) [Thu, 10 May 2018 17:40:22 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510

Change-Id: I689d44b6617f0ed949e3f72367980158ea06ad0d

6 years ago[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373
Android Build Merger (Role) [Thu, 10 May 2018 17:40:16 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373

Change-Id: I2166c2f9ca0a6654e1a88b1d183062eb1564c24d