Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
681,351 Commits 3 Branches 0 Tags
eb078647ece0613114a9a54be0701e8e1075071d
Commit Graph

681351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
eb078647ec Merge "Revert "Increase debounce time for DISCONNECT processing"" into sc-dev am: 3e46e3bd10 am: f587a0416e am: 0529fb1dc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16439364

Change-Id: Ic4b82c8c827fb4ffa274a75d20601ca4bd171747
 2021-12-21 19:19:25 +00:00
TreeHugger Robot
6ada0018b5 Merge "Revert "Increase debounce time for DISCONNECT processing"" into sc-dev am: 3e46e3bd10 am: f587a0416e am: 3b800994af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16439364

Change-Id: Id796d4c633b90195850f03930107253d4cec7be2
 2021-12-21 19:12:29 +00:00
TreeHugger Robot
0529fb1dc8 Merge "Revert "Increase debounce time for DISCONNECT processing"" into sc-dev am: 3e46e3bd10 am: f587a0416e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16439364

Change-Id: I836c19ffb6571e9e4c1aa3bbaedf859b7ad7309f
 2021-12-21 19:07:16 +00:00
TreeHugger Robot
3b800994af Merge "Revert "Increase debounce time for DISCONNECT processing"" into sc-dev am: 3e46e3bd10 am: f587a0416e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16439364

Change-Id: Ia5af3a0e7ad31095af77d6b886f707275797ff9f
 2021-12-21 19:07:16 +00:00
Amy Gu
9001310c40 Merge "Specify two item limit for EXTRA_CHOOSER_TARGETS and EXTRA_INITIAL_INTENTS" am: 73ded9f9df am: b5f0629d41 am: 379347b29a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1858069

Change-Id: I9d0089997234826e6310d4fcda14cdf869ec5fdb
 2021-12-21 19:06:21 +00:00
TreeHugger Robot
f587a0416e Merge "Revert "Increase debounce time for DISCONNECT processing"" into sc-dev am: 3e46e3bd10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16439364

Change-Id: I296a8678a6120c36a5d501f64134647d5fa6eb18
 2021-12-21 18:54:21 +00:00
Amy Gu
379347b29a Merge "Specify two item limit for EXTRA_CHOOSER_TARGETS and EXTRA_INITIAL_INTENTS" am: 73ded9f9df am: b5f0629d41 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1858069

Change-Id: I7e00c46550eba9eb810d5b5112d6a4dd30d157cf
 2021-12-21 18:53:01 +00:00
TreeHugger Robot
3e46e3bd10 Merge "Revert "Increase debounce time for DISCONNECT processing"" into sc-dev 2021-12-21 18:39:47 +00:00
Amy Gu
b5f0629d41 Merge "Specify two item limit for EXTRA_CHOOSER_TARGETS and EXTRA_INITIAL_INTENTS" am: 73ded9f9df 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1858069

Change-Id: I17ca9c8d0bb5ecad604bd5d2de5cb901ca7aafbd
 2021-12-21 18:26:06 +00:00
Treehugger Robot
ecf6241e5c Merge "Adding mustPlayShutterSound to break Cam2 dependency on Cam1" am: cb6c04738b am: 9b83844f48 am: 401703e3aa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1911999

Change-Id: Ib9ab9f740e096ce901155ed73a40504bd7ed9863
 2021-12-21 18:24:10 +00:00
Amy Gu
73ded9f9df Merge "Specify two item limit for EXTRA_CHOOSER_TARGETS and EXTRA_INITIAL_INTENTS" 2021-12-21 18:07:36 +00:00
Treehugger Robot
401703e3aa Merge "Adding mustPlayShutterSound to break Cam2 dependency on Cam1" am: cb6c04738b am: 9b83844f48 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1911999

Change-Id: If3fc78d7c5e3a4813bb3ff5cd9e83b60af4857dc
 2021-12-21 18:05:30 +00:00
Winson Chung
0ef5032c45 Merge "Add debug logging for null task list" into sc-v2-dev am: cb1f78f054 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16486954

Change-Id: I36850a0f60ce0b8a09912f010499d4d67622aed0
 2021-12-21 17:53:29 +00:00
Treehugger Robot
9b83844f48 Merge "Adding mustPlayShutterSound to break Cam2 dependency on Cam1" am: cb6c04738b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1911999

Change-Id: Idb8c87169627dd4068948c9402b56988c0e31507
 2021-12-21 17:48:21 +00:00
Winson Chung
cb1f78f054 Merge "Add debug logging for null task list" into sc-v2-dev 2021-12-21 17:35:08 +00:00
Treehugger Robot
cb6c04738b Merge "Adding mustPlayShutterSound to break Cam2 dependency on Cam1" 2021-12-21 17:30:31 +00:00
Treehugger Robot
fe17ca0a4b Merge "[MS14] Move isPersistable to NetworkPolicy" am: f421f1dd68 am: 3c4a90eda1 am: 3dd00d784f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1925762

Change-Id: Iff7f2e8f21941603daa8479d78024caddff79325
 2021-12-21 17:02:02 +00:00
Treehugger Robot
3dd00d784f Merge "[MS14] Move isPersistable to NetworkPolicy" am: f421f1dd68 am: 3c4a90eda1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1925762

Change-Id: I87ac119e8e44fc03e7fcdf9a1185e5b68436def2
 2021-12-21 16:44:57 +00:00
Treehugger Robot
3c4a90eda1 Merge "[MS14] Move isPersistable to NetworkPolicy" am: f421f1dd68 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1925762

Change-Id: Ib1e0c171a514ec3b87a4e24b6def418df394bc97
 2021-12-21 16:26:56 +00:00
Treehugger Robot
f421f1dd68 Merge "[MS14] Move isPersistable to NetworkPolicy" 2021-12-21 16:09:25 +00:00
Treehugger Robot
d55e19f68b Merge "[MS12.1] Support NetworkTemplate builder" am: 00b74c9403 am: 90fb102d9a am: 8c5417d37b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926897

Change-Id: I8f44ee29eae472e0808b2a7e069bcdf6a42acf25
 2021-12-21 15:40:12 +00:00
Treehugger Robot
34560f945d Merge "Remove reference to nonplat sepolicy" am: d62f9054e8 am: b49a354cfd am: a76638e402 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1930822

Change-Id: Ibf60a0dd408a2b285e4643e7f7fe173fe7db34e9
 2021-12-21 15:39:45 +00:00
Treehugger Robot
8c5417d37b Merge "[MS12.1] Support NetworkTemplate builder" am: 00b74c9403 am: 90fb102d9a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926897

Change-Id: Ice1121e374744e0cc5269e3d6bb10cf0c7a1f9ad
 2021-12-21 15:27:56 +00:00
Treehugger Robot
90fb102d9a Merge "[MS12.1] Support NetworkTemplate builder" am: 00b74c9403 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926897

Change-Id: Id81797b2e5ede17dc6f5f6043246212086a2ffa5
 2021-12-21 15:23:50 +00:00
Treehugger Robot
a76638e402 Merge "Remove reference to nonplat sepolicy" am: d62f9054e8 am: b49a354cfd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1930822

Change-Id: Iafd4a16dc18fae46f900b57a0d8d277d830c30ec
 2021-12-21 15:23:05 +00:00
Treehugger Robot
00b74c9403 Merge "[MS12.1] Support NetworkTemplate builder" 2021-12-21 15:09:43 +00:00
Treehugger Robot
b49a354cfd Merge "Remove reference to nonplat sepolicy" am: d62f9054e8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1930822

Change-Id: Ib383e0dc0fb6d41bb67350d76ecae4fe45ddbce7
 2021-12-21 15:05:55 +00:00
Treehugger Robot
d62f9054e8 Merge "Remove reference to nonplat sepolicy" 2021-12-21 14:46:28 +00:00
Beverly Tai
a7edd83680 Merge "Update dwell ripple animation" into sc-v2-dev am: 76b2a10f2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16482510

Change-Id: Ic98421a3a26a170d4d245869009c4224c012fca9
 2021-12-21 14:30:33 +00:00
William Escande
c9dc2fe310 Merge "Add SystemApi to AudioManager method" am: 837956204e am: 8cdb8e97fb am: 6afaa06a05 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863722

Change-Id: I1cab8d1e87f82f4c939b5e27803c16369de2c0e6
 2021-12-21 14:14:05 +00:00
Beverly Tai
76b2a10f2b Merge "Update dwell ripple animation" into sc-v2-dev 2021-12-21 14:09:37 +00:00
William Escande
6afaa06a05 Merge "Add SystemApi to AudioManager method" am: 837956204e am: 8cdb8e97fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863722

Change-Id: I6640b3664adc9cf0480c6aeadbc3983fad7f8950
 2021-12-21 13:56:16 +00:00
Aaron Huang
e439212deb Merge "Make IpSecManager.DIRECTION_FWD @SystemApi" am: 644ab1a544 am: 453ce239aa am: 63c911b9d5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928463

Change-Id: Ie524806023ddceb4481831a05a4750112f4be1b7
 2021-12-21 13:48:51 +00:00
William Escande
8cdb8e97fb Merge "Add SystemApi to AudioManager method" am: 837956204e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863722

Change-Id: I7c3edc556a9fd84a136afb099b5f82149eda3d00
 2021-12-21 13:38:54 +00:00
Aaron Huang
63c911b9d5 Merge "Make IpSecManager.DIRECTION_FWD @SystemApi" am: 644ab1a544 am: 453ce239aa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928463

Change-Id: Ia0bb5e4ce32c4c4de5a84db72a4e5bb13bdc334e
 2021-12-21 13:32:45 +00:00
William Escande
837956204e Merge "Add SystemApi to AudioManager method" 2021-12-21 13:23:13 +00:00
Aaron Huang
453ce239aa Merge "Make IpSecManager.DIRECTION_FWD @SystemApi" am: 644ab1a544 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928463

Change-Id: Ifc4c16988891fd67f8b04128b55a5f57109c7490
 2021-12-21 13:08:28 +00:00
Aaron Huang
644ab1a544 Merge "Make IpSecManager.DIRECTION_FWD @SystemApi" 2021-12-21 12:49:49 +00:00
Martijn Coenen
08e521f02d Merge changes from topic "revert-1927643-mmtel_capability-TQUGHHKONR" am: c7dc6dc0da am: 60d94a4ce6 am: 5905fa1d55 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928148

Change-Id: Ia07d4ea676a783c0f15d3cb4e5fe839cf27c3365
 2021-12-21 12:09:33 +00:00
Martijn Coenen
8e2325ad42 Revert "Added a new network capability MMTEL" am: bcfe8037e2 am: 39beeb7b45 am: 7992c40489 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928147

Change-Id: I24e552ae8e10cf6066a2163f15cb4c222d68b82b
 2021-12-21 12:09:18 +00:00
Treehugger Robot
2e7981b69c Merge changes from topic "mmtel_capability" am: 4b07c1b401 am: 6ab83e6216 am: 764e5d7fae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1927643

Change-Id: I5a5e41fed75e943a44a20a14cde5faad4de7b692
 2021-12-21 12:08:27 +00:00
Jack Yu
159dd37881 Added setup/tear down data support am: 09c6189ae4 am: 1049457581 am: ec849ed683 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1927642

Change-Id: Iabce633fe76b7df035d7cbc7e97265040fd4dc80
 2021-12-21 12:08:18 +00:00
Martijn Coenen
5905fa1d55 Merge changes from topic "revert-1927643-mmtel_capability-TQUGHHKONR" am: c7dc6dc0da am: 60d94a4ce6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928148

Change-Id: I8bc7f5a2c6c42b85991b7a1d277cc34ba857687f
 2021-12-21 11:41:46 +00:00
Martijn Coenen
7992c40489 Revert "Added a new network capability MMTEL" am: bcfe8037e2 am: 39beeb7b45 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928147

Change-Id: I407ff85f69cd0a931d8d0c45b336f83b8dcbb062
 2021-12-21 11:41:43 +00:00
Treehugger Robot
764e5d7fae Merge changes from topic "mmtel_capability" am: 4b07c1b401 am: 6ab83e6216 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1927643

Change-Id: I6dda7fbe2b65fb468cc90aceafc71a0d766c25b3
 2021-12-21 11:41:07 +00:00
Jack Yu
ec849ed683 Added setup/tear down data support am: 09c6189ae4 am: 1049457581 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1927642

Change-Id: I4b89c5096d84074b9cfca92ede52d8204651d4df
 2021-12-21 11:41:04 +00:00
Martijn Coenen
60d94a4ce6 Merge changes from topic "revert-1927643-mmtel_capability-TQUGHHKONR" am: c7dc6dc0da 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928148

Change-Id: I50abb56e28b40db770c2c32c74d1d255c9e9efc0
 2021-12-21 11:37:26 +00:00
Martijn Coenen
39beeb7b45 Revert "Added a new network capability MMTEL" am: bcfe8037e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928147

Change-Id: I6057a67c41d0a9fd114a2b5696ad415d20623238
 2021-12-21 11:37:15 +00:00
Martijn Coenen
c7dc6dc0da Merge changes from topic "revert-1927643-mmtel_capability-TQUGHHKONR" 
* changes:
  Revert "Added setup/tear down data support"
  Revert "Added a new network capability MMTEL"
 2021-12-21 11:27:16 +00:00
Martijn Coenen
bcfe8037e2 Revert "Added a new network capability MMTEL" 
Revert "Added a new network capability MMTEL"

Revert submission 1927643-mmtel_capability

Reason for revert: b/211586152
Reverted Changes:
Ifea8b1e40:Added a new network capability MMTEL
I38655bef2:Added a new network capability MMTEL
I837606d9e:Added setup/tear down data support
I2c7b291fe:Added a new network capability MMTEL

Change-Id: Ifd818ba06bc8c6a10bf0393243443d049e5d7503
 2021-12-21 11:24:01 +00:00