Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
880,944 Commits 3 Branches 0 Tags
ad2fff129efc2bbe5286e9068e4e234eca771fbb
Commit Graph

880944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
ad2fff129e Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-13 20:38:19 +00:00
Bill Yi
3e23e896f7 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-13 20:38:19 +00:00
Bill Yi
1affcb5298 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-13 20:38:19 +00:00
Bill Yi
7499bea3c2 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-13 20:38:19 +00:00
Bill Yi
187ebc5e88 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-13 20:38:19 +00:00
Bill Yi
796ef7bab9 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-13 20:38:19 +00:00
Bill Yi
694a20bdaf Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-13 20:38:19 +00:00
Bill Yi
4a17978dda Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-13 20:38:19 +00:00
Arpan Kaphle
b88aaa3399 Merge "Collecting origin in logging system" into udc-dev 2023-04-13 20:21:05 +00:00
Fabian Kozynski
638885c6f7 Merge changes from topic "278068252" into udc-dev 
* changes:
  Add an AutoAddRepository
  Add auto add flag
 2023-04-13 20:18:46 +00:00
Treehugger Robot
a55fac1265 Merge "[CDM] Add shell cmd to create a dummy transport" into udc-dev 2023-04-13 19:41:20 +00:00
Lucas Silva
2023485be6 Merge changes from topic "presubmit-am-032b75464d75462f9af7baff82a93ac3" into tm-qpr-dev-plus-aosp am: 7a67c2644f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22595180

Change-Id: Ia22bd6adc264c40f14f737839dbbd09b834ed10e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 19:21:25 +00:00
Lucas Silva
e0962e8e0b [automerger skipped] [automerge] DO NOT MERGE Fix crash related to getting the root of an unattached view 2p: 68cb239bb0 am: 6e6a473c20 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22595180

Change-Id: I79728213d7c9f2dc1ad5f53fc818377c8306bb33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 19:20:59 +00:00
Mateusz Cicheński
8307fc2528 [automerger skipped] Merge "Revert "Remove pip resize flicks" DO NOT MERGE" into tm-qpr-dev am: 052ffcf858 am: 30aa776250 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22608608

Change-Id: I170dd7b7f3a49a712ec501968a896185460d41d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 19:20:08 +00:00
Bill Yi
a43d70b076 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27f7b26e72 -s ours am: b742009581 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22572703

Change-Id: I88a475b23c88847f0d393dde89db5b2c15d3a983
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 19:18:09 +00:00
Automerger Merge Worker
92ef1e5fe3 Merge changes from topic "am-e9f54b7e2b304d1f9ba6a80b494b4f9b" into tm-qpr-dev-plus-aosp am: e35cea7c5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22571729

Change-Id: I11ce9d4afc96d45bbf027244047db944fb034cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 19:16:17 +00:00
Bill Yi
59f5687726 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4b13c8588f -s ours am: 9ac288694c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22571729

Change-Id: I9dd2da615ae92ced3d09ba18dc73194369425ab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 19:15:03 +00:00
Lucas Silva
7a67c2644f Merge changes from topic "presubmit-am-032b75464d75462f9af7baff82a93ac3" into tm-qpr-dev-plus-aosp 
* changes:
  [automerge] DO NOT MERGE Fix crash related to getting the root of an unattached view 2p: 68cb239bb0
  DO NOT MERGE Fix crash related to getting the root of an unattached view
 2023-04-13 19:13:02 +00:00
Behnam Heydarshahi
4939d78cdf Merge "Fix volume CSD tests not cleanring up" into udc-dev 2023-04-13 19:02:41 +00:00
Mateusz Cicheński
13bb0623b5 Merge changes from topic "presubmit-am-26cd630fe4764e5eaaa4330c4c65bd6a" into tm-qpr-dev-plus-aosp am: 9e09709065 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22608608

Change-Id: I6fb182f46e5b00a15c73551309fdfd183280515f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:52:53 +00:00
Mateusz Cicheński
9f9b3925dd [automerger skipped] [automerge] Revert "Remove pip resize flicks" DO NOT MERGE 2p: ce1ef55f1a am: b4e5a1486c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22608608

Change-Id: I83404a72ef72723de78e892c58b6e67f9f69c2bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:51:13 +00:00
Mateusz Cicheński
30aa776250 Merge "Revert "Remove pip resize flicks" DO NOT MERGE" into tm-qpr-dev am: 052ffcf858 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22608608

Change-Id: Id64bcc4b7d810881256d2cea241fee5cba6b5a73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:44:41 +00:00
Bill Yi
b742009581 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27f7b26e72 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22572703

Change-Id: I6ba33fcdda5ab241def9d356a8895f0735d31636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:43:44 +00:00
Jacqueline Bronger
c856b8b9a5 Merge "Fix Tv PiP fullscreen shell transition (bounds)" into udc-dev 2023-04-13 18:42:05 +00:00
Automerger Merge Worker
e35cea7c5a Merge changes from topic "am-e9f54b7e2b304d1f9ba6a80b494b4f9b" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4b13c8588f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6dd833657d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c4b7ef5d1b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2614d590fd -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d9339de5f9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9b5287a751 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c648dd466c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 63b459b876 -s ours
 2023-04-13 18:38:38 +00:00
Aaron Liu
358c7f6ddf Merge changes I85e60cfc,I82a5aea6 into udc-dev 
* changes:
  Make getCurrentController async friendly.
  Add custom message to bouncer
 2023-04-13 18:38:01 +00:00
Bill Yi
9ac288694c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4b13c8588f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22571729

Change-Id: I572508a68756d44640d1fc01abd972cfcced27a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:37:42 +00:00
Bill Yi
a3655c39f3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6dd833657d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22571729

Change-Id: I0f550e92198189b8f7067612c095c41e19da3685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:37:32 +00:00
Bill Yi
c97bdc59c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c4b7ef5d1b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22569885

Change-Id: I67442544bfe16ec3a75e3658ae45f4388a8d3120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:37:21 +00:00
Bill Yi
db7cd1b86e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2614d590fd -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22569885

Change-Id: Ic68ecd0fd627c0a2935d6cedcb8e9f1f4d509863
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:36:50 +00:00
Bill Yi
ead0a4b01f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d9339de5f9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22567809

Change-Id: I2a5a03399285f119526b7f7f8d3ea224ce84e8f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:36:24 +00:00
Mateusz Cicheński
052ffcf858 Merge "Revert "Remove pip resize flicks" DO NOT MERGE" into tm-qpr-dev 2023-04-13 18:35:46 +00:00
Mateusz Cicheński
9e09709065 Merge changes from topic "presubmit-am-26cd630fe4764e5eaaa4330c4c65bd6a" into tm-qpr-dev-plus-aosp 
* changes:
  [automerge] Revert "Remove pip resize flicks" DO NOT MERGE 2p: ce1ef55f1a
  Revert "Remove pip resize flicks" DO NOT MERGE
 2023-04-13 18:35:45 +00:00
Bill Yi
d8b7e91559 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9b5287a751 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22567809

Change-Id: I78dea824b0aaed69dc4244d323757ace3f13f25f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:35:06 +00:00
Bill Yi
4cdb8a2078 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c648dd466c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22567576

Change-Id: Ie7cdf5b26246113826c6ba7287df9babe7114d22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:34:49 +00:00
Bill Yi
18353c332d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 63b459b876 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22567576

Change-Id: If3fc85dc6ad33c6d5b4a25c715d3370d47614553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:33:28 +00:00
Bill Yi
2f535b338b Merge changes from topic "tc_change_23041115_23" into tm-qpr-dev-plus-aosp am: 1214de740a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22572703

Change-Id: I36b3d59b11d17403d7b677b522c30085921db41c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:32:42 +00:00
Bill Yi
8bbba6a394 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 62fcd93c35 am: f5109fe3f1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22572703

Change-Id: I435717189fccf2419a3870133343daab84ed3e27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:29:52 +00:00
Lucas Silva
b22d99ad52 Merge "Add intent for communal settings" into udc-dev 2023-04-13 18:28:43 +00:00
Treehugger Robot
8a0f1b451f Merge "Promote passing flicker tests on OpenAppFromLockNotificationWithLockOverlayApp" into udc-dev 2023-04-13 18:09:26 +00:00
Bill Yi
27f7b26e72 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-13 18:07:08 +00:00
Bill Yi
4b13c8588f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-13 18:07:08 +00:00
Bill Yi
c4b7ef5d1b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-13 18:07:08 +00:00
Bill Yi
d9339de5f9 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-13 18:07:08 +00:00
Bill Yi
c648dd466c Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-13 18:07:08 +00:00
Bill Yi
1214de740a Merge changes from topic "tc_change_23041115_23" into tm-qpr-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 62fcd93c35
  Import translations. DO NOT MERGE ANYWHERE
 2023-04-13 18:06:57 +00:00
Ivan Tkachenko
c7dfc839c0 Merge "Remove don't bubble option for app bubbles" into udc-dev 2023-04-13 17:50:46 +00:00
Kevin Liu
fcea4de7d7 Merge "Converted Biometric tests to Robolectric tests" into udc-dev 2023-04-13 17:22:14 +00:00
Guojing Yuan
7a8f22792e [CDM] Add shell cmd to create a dummy transport 
Fix: 277763214

Test: manually tested the cmd command
Change-Id: I3dfc93ee450654755c268215a77feeb496669511
Merged-In: I3dfc93ee450654755c268215a77feeb496669511
 2023-04-13 17:16:21 +00:00
Mohammed Rashidy
99d4a174f9 Merge "Remove ActivityRecords for sandbox activities when App/sandbox died" into udc-dev 2023-04-13 17:12:00 +00:00