Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
423,702 Commits 3 Branches 0 Tags
c8a530ea65c53849b377f2b431884319e39ce746
Commit Graph

423702 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Berglund
c8a530ea65 DO NOT MERGE Fixing build, missing parameter. 
Bug: 145946470, 146228232
Test: Builds locally
Change-Id: I7f3632c90ca424d70b1cc6e20f88e741ff25efaa
 2019-12-13 22:27:36 +00:00
Eric Berglund
721ba25c03 Merge "DO NOT MERGE Triggering status bar refresh on locale change so that the notifications panel updates to the new language." into qt-qpr1-dev 2019-12-13 20:01:18 +00:00
Automerger Merge Worker
aea739b3f4 Merge "Put userId at the end of parcel" into qt-dev am: 899f8301e0 am: 056b56c6b7 
Change-Id: Id17055f72243306cac9e46abff2cf313492f5e7c
 2019-12-13 19:31:04 +00:00
Automerger Merge Worker
056b56c6b7 Merge "Put userId at the end of parcel" into qt-dev am: 899f8301e0 
Change-Id: If6ce5c989102c8fb6cdc1fa82cde79817f6c3423
 2019-12-13 19:11:21 +00:00
TreeHugger Robot
899f8301e0 Merge "Put userId at the end of parcel" into qt-dev 2019-12-13 18:50:54 +00:00
Heemin Seog
480ea64acb Merge "DO NOT MERGE Make fixes to make sysui more customizable" into qt-qpr1-dev 2019-12-13 18:47:31 +00:00
Automerger Merge Worker
04a579c98b [automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am: 0f41dc420f am: 5f1d7675ea am: ad56194783 -s ours am: 929b23ac43 -s ours am: d98efda2ba am: 0626709062 
Change-Id: I80d933328f24433bf7f0b5087feaa25072f4b99a
 2019-12-13 18:19:00 +00:00
Automerger Merge Worker
7ff4dc9b9e [automerger skipped] RESTRICT AUTOMERGE am: fe4bf7926e am: 9680a6d75d am: e0465e2881 -s ours am: 8c5af9b7d9 -s ours am: 1ed77b86cf am: ee0de45fee 
Change-Id: I5133d09b6f17678932516ace8650d884e84175d5
 2019-12-13 18:18:45 +00:00
Automerger Merge Worker
0626709062 [automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am: 0f41dc420f am: 5f1d7675ea am: ad56194783 -s ours am: 929b23ac43 -s ours am: d98efda2ba 
Change-Id: I7feee02b0dfab2d74ee82fee39a2ba5a77c27f99
 2019-12-13 18:04:31 +00:00
Automerger Merge Worker
ee0de45fee [automerger skipped] RESTRICT AUTOMERGE am: fe4bf7926e am: 9680a6d75d am: e0465e2881 -s ours am: 8c5af9b7d9 -s ours am: 1ed77b86cf 
Change-Id: Icdc837b6af117638414dea01063a66161ce8465c
 2019-12-13 18:04:14 +00:00
Automerger Merge Worker
d98efda2ba [automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am: 0f41dc420f am: 5f1d7675ea am: ad56194783 -s ours am: 929b23ac43 -s ours 
am skip reason: subject contains skip directive

Change-Id: I53d35a4d2f2c517ec50cfdbc22008bda2e4041c5
 2019-12-13 17:50:17 +00:00
Automerger Merge Worker
1ed77b86cf [automerger skipped] RESTRICT AUTOMERGE am: fe4bf7926e am: 9680a6d75d am: e0465e2881 -s ours am: 8c5af9b7d9 -s ours 
am skip reason: subject contains skip directive

Change-Id: I05c1ed670d07b677a8e6a20b4d50a06b7482cbc6
 2019-12-13 17:49:57 +00:00
Automerger Merge Worker
929b23ac43 [automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am: 0f41dc420f am: 5f1d7675ea am: ad56194783 -s ours 
am skip reason: subject contains skip directive

Change-Id: I5b7670226082f60abc45ae023e687a8b0191f20e
 2019-12-13 17:37:31 +00:00
Automerger Merge Worker
8c5af9b7d9 [automerger skipped] RESTRICT AUTOMERGE am: fe4bf7926e am: 9680a6d75d am: e0465e2881 -s ours 
am skip reason: subject contains skip directive

Change-Id: I67f8185d1a6d3b75fad924d07e8eb6e8e9db0207
 2019-12-13 17:37:15 +00:00
Automerger Merge Worker
b29239f66f [automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-mr1-dev am: b64534ceb2 -s ours am: 4505eccb39 -s ours am: 3c352b62af am: 8e3b22b5d7 
Change-Id: Ib6b1c893ff93650a06919b3cfe333ba3ac6186f1
 2019-12-13 17:31:02 +00:00
Automerger Merge Worker
f210526ceb [automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into pi-dev am: 4b6e07283c -s ours am: 2b4b2c3d5a am: 512268ba7b 
Change-Id: I129c434e45648047df954e6ef9d2c291f8d2817d
 2019-12-13 17:30:35 +00:00
Automerger Merge Worker
1c3702754a Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into qt-dev am: 1e53d56481 am: 5830ae29c5 
Change-Id: I8f7ad58c68a6aff639ec6e8e394b53f24e33fdfe
 2019-12-13 17:29:54 +00:00
Automerger Merge Worker
0faa0ae851 RESTRICT AUTOMERGE am: b81f269ae2 am: db965097eb 
Change-Id: I78c1a49ba6c0b883b506320dbfa2503e4c3c4c5e
 2019-12-13 17:29:38 +00:00
Automerger Merge Worker
ad56194783 Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am: 0f41dc420f am: 5f1d7675ea 
Change-Id: I197f9d12435267964c84bfcee18c371611fa728c
 2019-12-13 17:14:42 +00:00
Automerger Merge Worker
e0465e2881 RESTRICT AUTOMERGE am: fe4bf7926e am: 9680a6d75d 
Change-Id: I490bf47b2c6588da4b28998333fbfb197688d6c0
 2019-12-13 17:14:28 +00:00
Automerger Merge Worker
8e3b22b5d7 [automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-mr1-dev am: b64534ceb2 -s ours am: 4505eccb39 -s ours am: 3c352b62af 
Change-Id: Ia263bc63065b686eec529b04036bcd89df0135e4
 2019-12-13 17:07:57 +00:00
Automerger Merge Worker
512268ba7b [automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into pi-dev am: 4b6e07283c -s ours am: 2b4b2c3d5a 
Change-Id: I01afa68e3cea31b7fe868d14fb612718cdf2a257
 2019-12-13 17:07:28 +00:00
Automerger Merge Worker
5830ae29c5 Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into qt-dev am: 1e53d56481 
Change-Id: I19ff0f27ad95dc5d80a1c6ae444a91befeba9670
 2019-12-13 17:07:06 +00:00
Automerger Merge Worker
db965097eb RESTRICT AUTOMERGE am: b81f269ae2 
Change-Id: Ia2afa630f1df185c6d38775768d9f3dfb54a2f16
 2019-12-13 17:06:50 +00:00
Automerger Merge Worker
3c352b62af [automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-mr1-dev am: b64534ceb2 -s ours am: 4505eccb39 -s ours 
am skip reason: subject contains skip directive

Change-Id: I7a98fa39acee962cf209fa64abdac9a708497d98
 2019-12-13 17:02:27 +00:00
Automerger Merge Worker
5f1d7675ea Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am: 0f41dc420f 
Change-Id: I0b4b6a26b538d6f51780413376d70b6906877893
 2019-12-13 17:02:07 +00:00
Automerger Merge Worker
9680a6d75d RESTRICT AUTOMERGE am: fe4bf7926e 
Change-Id: I92627314fc09b129f37b08192084c5b807a00ed2
 2019-12-13 17:01:46 +00:00
Automerger Merge Worker
2b4b2c3d5a [automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into pi-dev am: 4b6e07283c -s ours 
am skip reason: subject contains skip directive

Change-Id: I5e7c7ba4ba9d7c460a1e73e9e5b0feb01b5ae31d
 2019-12-13 17:01:11 +00:00
Automerger Merge Worker
4505eccb39 [automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-mr1-dev am: b64534ceb2 -s ours 
am skip reason: subject contains skip directive

Change-Id: I46e62bd45f14b79772dbb584167a01bef66b314b
 2019-12-13 16:57:18 +00:00
Sterling Huber
b64534ceb2 Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-mr1-dev 2019-12-13 16:44:15 +00:00
Sterling Huber
0f41dc420f Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev 2019-12-13 16:44:15 +00:00
Sterling Huber
4b6e07283c Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into pi-dev 2019-12-13 16:44:15 +00:00
Sterling Huber
1e53d56481 Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into qt-dev 2019-12-13 16:44:14 +00:00
Heemin Seog
731dafbd43 DO NOT MERGE Make fixes to make sysui more customizable 
Bug: 144567659
Bug: 145547127
Test: manual
Change-Id: I66a0a7794ecfcdddd47d28ee681c904f799c5928
 2019-12-13 16:41:45 +00:00
Tony Mak
642c22b223 Put userId at the end of parcel 
userId is a new field added in ag/8350816, and it is written in between
some old fields when we parcelize it.

That breaks AiAi because some of its code rely on the implementation
details of SelectionEvent.writeToParcel.

In the long run, we may want to update AiAi such that it works
without this assumption, but before that, let's fix that in platform
for now.

Bug: 145962464
Bug: 123232892

Test: atest FrameworksCoreTests:android.view.textclassifier.SelectionEventTest

Merged-In: I98137a095cddf0fb4c600e1e09eef507bb750528
Change-Id: I66f65ac4c81ca964f710404fd081496355276435
 2019-12-13 02:47:21 +00:00
Automerger Merge Worker
78059be78c Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into qt-dev am: e8ba34a851 am: a4967992c1 
Change-Id: I4b60f33db0cb582580f19f82f4af1bebf63a75c1
 2019-12-13 00:44:35 +00:00
Automerger Merge Worker
c996b91a39 RESTRICT AUTOMERGE am: bf04ea6d3b am: bcdf0aacd5 
Change-Id: I32a343ab313d8f61d097f8ce2f705fff355777ef
 2019-12-13 00:44:14 +00:00
Automerger Merge Worker
a4967992c1 Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into qt-dev am: e8ba34a851 
Change-Id: Iefe7ac373d783298f608effd81ae50b21053d69c
 2019-12-13 00:26:40 +00:00
Automerger Merge Worker
bcdf0aacd5 RESTRICT AUTOMERGE am: bf04ea6d3b 
Change-Id: I4c99e09d21cd93af567f186ae1e86ab076c96ce3
 2019-12-13 00:26:31 +00:00
TreeHugger Robot
e8ba34a851 Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into qt-dev 
* changes:
  RESTRICT AUTOMERGE Fixes NPE when preparing app data during init
  RESTRICT AUTOMERGE Use KNOWN_PACKAGES when shared lib consumers
  RESTRICT AUTOMERGE Handles null outInfo in deleteSystemPackageLI
 2019-12-13 00:15:10 +00:00
Abhijoy Saha
d185a842c1 DO NOT MERGE Set CarSysUI unprovisioned state depending on SUW progress. 
Use a controller to monitor KEY_SETUP_WIZARD_IN_PROGRESS and USER_SETUP_COMPLETE
flags to know when to set CarSysUI bars in an unprovisioned state and prevent
interactions with notification shade.

Bug: 145616123
Test: Manual
Change-Id: Ie035f049e3e9e7cb411fc9553a20e4c09078c121
 2019-12-12 14:46:57 -08:00
Youngjun Kwak
98e8a9e301 Merge "DO NOT MERGE Defer Hvac initialization until after BOOT_COMPLETED event." into qt-qpr1-dev 2019-12-12 22:25:14 +00:00
Eric Berglund
62a0d5ea25 DO NOT MERGE Triggering status bar refresh on locale change so that the notifications panel updates to the new language. 
Bug: 145946470
Test: Manual
Change-Id: I85dddcf4596a74e3031618f24246b6af2fb158b4
 2019-12-12 22:25:05 +00:00
TreeHugger Robot
4a03ca6ad1 Merge "Check screenlock for unlock dialog" into qt-qpr1-dev 2019-12-12 22:23:16 +00:00
Long Ling
4274934c01 Merge "Clamp brightness thresholds to the maximum brightness." into qt-qpr1-dev 2019-12-12 21:48:51 +00:00
Winson Chung
d6e73ec8f1 Merge "Fix nav bar leak in SystemUI" into qt-qpr1-dev 2019-12-12 21:27:08 +00:00
Brad Ebinger
f275d96b99 Merge "Add CarrierConfig for roaming PLMNS that will need emer DDS switch" into qt-qpr1-dev 2019-12-12 21:08:36 +00:00
Jay Aliomer
e425a9c8d7 Merge "Apply Dark theme changes when screen off only" into qt-qpr1-dev 2019-12-12 20:32:00 +00:00
TreeHugger Robot
0934fee1ef Merge "Make emergency notification dismissable" into qt-qpr1-dev 2019-12-12 20:29:43 +00:00
Santos Cordon
a7991ab888 Clamp brightness thresholds to the maximum brightness. 
Bug: 144702254
Test: atest AutomaticBrightnessControllerTest

Change-Id: Ia8ac92cf306424d1324d028559f4260b9f80d482
Merged-In: Ia8ac92cf306424d1324d028559f4260b9f80d482
 2019-12-12 12:17:02 -08:00