Bill Yi
76a64e725c
[automerger skipped] Import translations. DO NOT MERGE
...
am: 09da14be40 -s ours
am skip reason: subject contains skip directive
Change-Id: I431dd3f3d3c535610ef2d5f48bd8543a4dc92066
2019-07-22 12:20:48 -07:00
Mathew Inwood
ebd7b1c2ea
Merge "Always apply compat changes to system apps." am: e691553aa6
...
am: fe17bdccf9
Change-Id: I686647d8fa95d8fd788e76c48f518ebd51e6440e
2019-07-22 11:59:11 -07:00
Andrei Onea
711f375337
[automerger skipped] resolve merge conflicts of 1faafcb488 to stage-aosp-master
...
am: d7ecd0d24d -s ours
am skip reason: change_id I981067477f6f4aa435459c0bc9a52099e6f5d445 with SHA1 c014fb5ca9 is in history
Change-Id: Ic3931ede8ddc760f883f218ff671d684fe65152c
2019-07-22 11:50:45 -07:00
Mathew Inwood
fe17bdccf9
Merge "Always apply compat changes to system apps."
...
am: e691553aa6
Change-Id: I85cba145cfe4258697c07831358292e9f4a03477
2019-07-22 11:49:28 -07:00
Bill Yi
09da14be40
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I8688211f4bb949f51359257a442b81d62e7057bf
2019-07-22 11:01:57 -07:00
Nick Cook
3fd9f9aaf9
Merge "docs: Fix broken link." into qt-dev
...
am: 2aec022fd2
Change-Id: I7a3c62f0259757be3921b2c8f6b8a2e3d6aa0bd7
2019-07-22 10:44:42 -07:00
Nick Cook
2aec022fd2
Merge "docs: Fix broken link." into qt-dev
2019-07-22 17:24:07 +00:00
Andrei Onea
d7ecd0d24d
resolve merge conflicts of 1faafcb488 to stage-aosp-master
...
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I055f014081e454b1dcfb8523a0387d7bc4b4ff9a
Merged-In: I981067477f6f4aa435459c0bc9a52099e6f5d445
Exempted-From-Owner-Approval: merge conflict resolution
2019-07-22 17:56:59 +01:00
Frank Li
1b4173d819
Merge "Add one field(sampling_rate_denom) in NetworkDnsEventReported for recording sample rate." am: 929cb5fc7f
...
am: 736173bba2
Change-Id: I3ef5f5f48b3de95f5bb3acc915913d810673e80a
2019-07-22 07:54:05 -07:00
Frank Li
736173bba2
Merge "Add one field(sampling_rate_denom) in NetworkDnsEventReported for recording sample rate."
...
am: 929cb5fc7f
Change-Id: I63dadfe56ab3b08ba29bb0b60e0f282a6a458867
2019-07-22 07:45:24 -07:00
Mathew Inwood
a6ff7d968d
[automerger skipped] resolve merge conflicts of 9acd72c60b to stage-aosp-master
...
am: 3020e050d0 -s ours
am skip reason: change_id I2fcf25264c62acc801f9e62967072cd04e4641e7 with SHA1 be2b0a71d7 is in history
Change-Id: I58805df7054e714688c744883cb722bc8e5a7209
2019-07-22 07:44:46 -07:00
Mathew Inwood
e691553aa6
Merge "Always apply compat changes to system apps."
2019-07-22 13:27:28 +00:00
Andrei-Valentin Onea
1faafcb488
Merge "Add adb command for overriding platform compat config"
2019-07-22 12:44:18 +00:00
Andrei Onea
c014fb5ca9
Add adb command for overriding platform compat config
...
New adb command supports has the format:
adb shell am compat enable|disable|reset <CHANGE_ID|CHANGE_NAME> <PACKAGE_NAME>
Bug: 136051618
Test: adb shell am compat enable 42 foo.bar.baz
Test: adb shell am compat disable 42 foo.bar.baz
Test: adb shell am compat reset 42 foo.bar.baz
Test: adb shell am compat enable fooChange foo.bar.baz
Change-Id: I981067477f6f4aa435459c0bc9a52099e6f5d445
Merged-In: I981067477f6f4aa435459c0bc9a52099e6f5d445
Exempted-From-Owner-Approval: cherry-pick of an already approved CL
(cherry picked from commit a2055011db )
2019-07-22 10:43:35 +00:00
Mathew Inwood
345b1d5344
Always apply compat changes to system apps.
...
System apps should always get the "latest" behaviour from the platform
since they are updated with the platform.
Bug: 135010838
Test: atest CompatConfigTest
Change-Id: Ieacac20dc0eb02e4687dfe0b7b4800b3fce3db83
2019-07-22 11:38:40 +01:00
Mathew Inwood
3020e050d0
resolve merge conflicts of 9acd72c60b to stage-aosp-master
...
Bug: None
Test: TH
Merged-In: I2fcf25264c62acc801f9e62967072cd04e4641e7
Change-Id: I5bc6b8c20bda03b3760f13f747b1e2069bfd9ac1
2019-07-22 09:29:24 +00:00
Bill Yi
2968a449bc
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 69d1c9c037 -s ours
am skip reason: subject contains skip directive
Change-Id: I7bd7262b93b4e673131261b812a15fe8d27189fe
2019-07-20 23:43:08 -07:00
Bill Yi
0ef8cddcba
[automerger skipped] Import translations. DO NOT MERGE
...
am: 82f1099361 -s ours
am skip reason: subject contains skip directive
Change-Id: I868e18e9f1ad0c43c8d30f40b7b7efb8d5798581
2019-07-20 23:38:10 -07:00
TreeHugger Robot
69d1c9c037
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-07-21 06:24:29 +00:00
Frank Li
929cb5fc7f
Merge "Add one field(sampling_rate_denom) in NetworkDnsEventReported for recording sample rate."
2019-07-21 05:47:53 +00:00
Bill Yi
82f1099361
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9041213adcd88452a12b56e110017a314f7a8139
2019-07-20 21:30:49 -07:00
lifr
2b9fab728d
Add one field(sampling_rate_denom) in NetworkDnsEventReported for recording sample rate.
...
The sample rate of DNS stats(to statsd) is 1/sampling_rate_denom.
Bug: 133111380
Test: ./out/host/linux-x86/bin/statsd_testdrive 116
Change-Id: I85acc8cb8ec4c38e95f7e97b0dd8da1294d9ceb3
2019-07-20 17:50:54 +00:00
Bill Yi
e3f111ad7e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I5bc0c666b5733a049ecffef86891a1d564bfdfc8
2019-07-20 10:14:43 -07:00
Selim Cinek
708890baf1
Merge "Fixed a crash with the headsUpManager" into qt-dev
...
am: fcd42e9249
Change-Id: I9de522a29955f192db26c2911307fb66ea0aefab
2019-07-19 17:36:38 -07:00
TreeHugger Robot
fcd42e9249
Merge "Fixed a crash with the headsUpManager" into qt-dev
2019-07-19 23:55:30 +00:00
Lucas Dupin
a65f90b824
Merge "Use binned brightness sensor instead of prox" into qt-dev
...
am: cdc566dfd6
Change-Id: Ic4f1592ae6e9d62abd47734465d4f4638a70576e
2019-07-19 15:56:38 -07:00
TreeHugger Robot
cdc566dfd6
Merge "Use binned brightness sensor instead of prox" into qt-dev
2019-07-19 22:33:20 +00:00
Dave Mankoff
8d7481f01e
Merge "Enable the BrightLineFalsingManager by default on Q." into qt-dev
...
am: 0e680785e4
Change-Id: I92f0755aa748e131dea5a9fc5c22d7caecf33233
2019-07-19 13:12:00 -07:00
Dave Mankoff
0e680785e4
Merge "Enable the BrightLineFalsingManager by default on Q." into qt-dev
2019-07-19 19:54:03 +00:00
Lucas Dupin
f61c1044fb
Use binned brightness sensor instead of prox
...
Prox can be noisy and should only be used as a fallback when a more
robust sensor implementation is not available.
Test: manually cover prox sensor
Test: breakpoint
Test: dumpsys
Fixes: 137451005
Change-Id: If0fca42aca36546942930ce76be1353129fc91fc
2019-07-19 12:16:25 -07:00
Selim Cinek
41e7e6edc7
Fixed a crash with the headsUpManager
...
Since the headsUpManager is calling out in various places to
its listeners, the callbacks may query the headsupmanager
in an internally inconsistent state, such that the pinned mode is
true but there is no topEntry. Let's add a null-check for
safety here.
Bug: 137804505
Test: atest SystemUITests
Change-Id: Ibae76b555ca51ccf676228b034a614d59a8b4e8e
2019-07-19 11:47:58 -07:00
Todd Kennedy
fb54410874
Merge "Postpone the shared user checking after Q" into qt-dev
...
am: 3f124d6463
Change-Id: Id2d44a418a58eb3b1456d81f03fe2f8fe28685e2
2019-07-19 10:25:41 -07:00
Nick Cook
4190144c27
Merge "docs: Fix broken link." into qt-dev
...
am: a2fe3be17d
Change-Id: I99943186126549eb9ce1269e619792e619c84bab
2019-07-19 10:16:48 -07:00
Todd Kennedy
3f124d6463
Merge "Postpone the shared user checking after Q" into qt-dev
2019-07-19 17:13:48 +00:00
Nick Cook
a2fe3be17d
Merge "docs: Fix broken link." into qt-dev
2019-07-19 16:58:50 +00:00
Dave Mankoff
b332588e60
Enable the BrightLineFalsingManager by default on Q.
...
Bug: 71762354
Change-Id: Icfc6e21d50e08c34168f504ec64bf654ba6cb6a4
Test: atest SystemUITests
2019-07-19 11:26:58 -04:00
Treehugger Robot
9acd72c60b
Merge "Compatibility API implementation for app processes."
2019-07-19 13:45:36 +00:00
SzuWei Lin
bdf04e88c7
Postpone the shared user checking after Q
...
The shared user checking becomes strict. If there is an APK in
vendor partition shared UID with a APK in system partition, the
signatures of these 2 APKs must be equal. Otherwise, framework
will throw an exception and cannot boot.
Postpone the checking from first_api_level 28 to 29.
Bug: 137524152
Test: test on a device with first_api_level=29 and pass the checking
Change-Id: I76d87a6dab35d4d39113cdd16a20706ce2c45093
2019-07-19 06:43:53 -07:00
Jiyong Park
511bd2ba29
Merge "Remove voip-common to the dependency list of *-api-stubs-docs" am: b5958c7c49
...
am: 1f51d97b8e
Change-Id: I6360cbd5e5a57358ca13c5d7645c6a8906c643de
2019-07-19 05:15:33 -07:00
Leland Miller
acdb2a1f78
Merge "Add @NonNull annotation to CONTENT_URI" am: 24eac6a4c7
...
am: 2772d55ac5
Change-Id: I534c4de1f74c35e41f96555f4d0b1d46aa452537
2019-07-19 05:13:11 -07:00
Jordan Liu
36d4a4cdaf
Merge "Fix sim pin on DSDS" am: 268b4a3ad4
...
am: fb8ca75270
Change-Id: Ic24cab8c9c8588c7d950bce3b7f8371a31047eb8
2019-07-19 05:08:14 -07:00
Jiyong Park
1f51d97b8e
Merge "Remove voip-common to the dependency list of *-api-stubs-docs"
...
am: b5958c7c49
Change-Id: Ibda507c3119892951aaf5a663e754479f4f84bbe
2019-07-19 04:55:14 -07:00
Leland Miller
2772d55ac5
Merge "Add @NonNull annotation to CONTENT_URI"
...
am: 24eac6a4c7
Change-Id: I6dd8cdee36c1288aa68436c4babbe837c4ffc722
2019-07-19 04:52:30 -07:00
Jordan Liu
fb8ca75270
Merge "Fix sim pin on DSDS"
...
am: 268b4a3ad4
Change-Id: I4bb53f6ac3e7302f60a922d7a4349ac9df601d7e
2019-07-19 04:51:49 -07:00
Treehugger Robot
b5958c7c49
Merge "Remove voip-common to the dependency list of *-api-stubs-docs"
2019-07-19 11:28:16 +00:00
Treehugger Robot
24eac6a4c7
Merge "Add @NonNull annotation to CONTENT_URI"
2019-07-19 08:54:31 +00:00
Bill Yi
a090c99dd6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: daeb1bb863 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib337c45783afb639275ab68ab889b0d328409d90
2019-07-18 14:57:44 -07:00
Bill Yi
7fb9af4242
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 465f347c2a -s ours
am skip reason: subject contains skip directive
Change-Id: I2f537649cf9c1d9ca9182491dc9f10a82ae88781
2019-07-18 14:52:46 -07:00
Nick Cook
42ece979a2
docs: Fix broken link.
...
Test: make ds-docs
Bug: 132635673
Change-Id: I9e6a493112418f7b1467d9d2926a1b2c106d4ad0
2019-07-18 21:44:50 +00:00
TreeHugger Robot
daeb1bb863
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-07-18 21:27:42 +00:00