Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
617,170 Commits 3 Branches 0 Tags
9d678211d93ebeb659f5c8b59f2a6306e41dfb03
Commit Graph

617170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
9d678211d9 NetworkWatchlistServiceTests: update IIpConnectivityMetrics. 
IIpConnectivityMetrics is gaining two new methods. Update the
subclass of that class used in NetworkWatchlistServiceTests to
reflect the new methods.

Bug: 171540887
Test: m FrameworksServicesTests
Change-Id: I3eb82680b6b3dd6b457095a484cf55560ff1088b
 2021-01-12 09:22:16 +00:00
Ryan Lin
c741ed776b Merge "Animate bounce effect when tapping" 2021-01-06 05:52:15 +00:00
Ryan Lin
b7b13df60b Merge "modularize the gesture detection mechanism for magnification" 2021-01-06 05:51:57 +00:00
Riddle Hsu
e1fab7b1cd Merge "Send ActivityOptions to client" 2021-01-06 05:30:58 +00:00
Automerger Merge Worker
3544db0da9 [automerger skipped] Merge changes from topic "am-48fce8054ea84f449c45918497754b47" into stage-aosp-master am: 5625f26cdc -s ours am: a5e51cb86a -s ours 
am skip reason: Change-Id Ife05ba75a3f23d0c18b3aa068881b6646dee6db5 with SHA-1 89667c6bb2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72c6d2936c1d590eb8c42ac62fcf5af8de5df20f
 2021-01-06 05:24:54 +00:00
Shuo Qian
87b66386a2 [automerger skipped] Merge "Add CAPABILITY_TYPE_CALL_COMPOSER in MmTelFeature" am: bfd05221a3 am: 83a86a1830 am: 7269b96458 -s ours 
am skip reason: Change-Id Ife05ba75a3f23d0c18b3aa068881b6646dee6db5 with SHA-1 89667c6bb2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a457e4e1984e1f0de15f2b33ab54e327ebe2234
 2021-01-06 05:24:07 +00:00
Shuo Qian
7270c066d9 [automerger skipped] Merge "Add Call Composer Carrier Config keys" am: 4260bc4f95 am: a1106b08fa am: 6d46ef0790 -s ours 
am skip reason: Change-Id I12d78f475b947cedb201ff1b379cc64a8f876e62 with SHA-1 136900101b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3f21f0fd5ca84b85c0fb3261d92d88d1776d5ba
 2021-01-06 05:24:00 +00:00
Shuo Qian
ebf5f30c28 [automerger skipped] Merge "Add call composer Extras for enriched calling" am: a4524a936a am: 6b65f68685 am: f35776e677 -s ours 
am skip reason: Change-Id I2af39eea48737df1bf629caea5b617736635f2aa with SHA-1 36b3dbc3ab is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b941accb7b1d4a0b2f6c3fa4b0768a000c87084
 2021-01-06 05:23:50 +00:00
Shuo Qian
4f30be1d02 [automerger skipped] Merge "Add CAPABILITY_CALL_COMPOSER in PhoneAccount for enriched calling." am: b31c9b4702 am: ce4f99fd74 am: d56018852c -s ours 
am skip reason: Change-Id Ibd1b0f0bc66487cfdb05d3de46c7e8df74eeb8cc with SHA-1 d24aea3148 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iefad365dd741bb4f33f68ee2c33fe0177424e44b
 2021-01-06 05:23:41 +00:00
Shuo Qian
276529d28b [automerger skipped] Merge "Add Call Composer API extras in TelecomManager" am: 6e419a49a7 am: 9a1365f43d am: 3785d3adf8 -s ours 
am skip reason: Change-Id I46cd9ee72de3d217fa23b368c0b88811cf8ce555 with SHA-1 3ed3883ff6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id692d7bd0de9d53dc846ac94bc5d49dd80aad057
 2021-01-06 05:23:32 +00:00
Automerger Merge Worker
a5e51cb86a [automerger skipped] Merge changes from topic "am-48fce8054ea84f449c45918497754b47" into stage-aosp-master am: 5625f26cdc -s ours 
am skip reason: Change-Id Ife05ba75a3f23d0c18b3aa068881b6646dee6db5 with SHA-1 d8e09b9744 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9fdf350c94e0009807b7ce600c77622e0250148d
 2021-01-06 05:07:34 +00:00
Shuo Qian
7269b96458 Merge "Add CAPABILITY_TYPE_CALL_COMPOSER in MmTelFeature" am: bfd05221a3 am: 83a86a1830 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535564

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iedd4cf6420d88da41c3ba9e849b2d06dc57145cb
 2021-01-06 05:02:53 +00:00
Shuo Qian
6d46ef0790 Merge "Add Call Composer Carrier Config keys" am: 4260bc4f95 am: a1106b08fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535178

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id284c446b1a39a3a208ab99037554081f70a8c9e
 2021-01-06 05:02:50 +00:00
Shuo Qian
f35776e677 Merge "Add call composer Extras for enriched calling" am: a4524a936a am: 6b65f68685 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535174

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d16a87f6769c113f19a2ea8d42c15bb1980c314
 2021-01-06 05:02:47 +00:00
Shuo Qian
d56018852c Merge "Add CAPABILITY_CALL_COMPOSER in PhoneAccount for enriched calling." am: b31c9b4702 am: ce4f99fd74 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535172

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac83990d1dcd99a1024b6eb77fc4a0201b268b7f
 2021-01-06 05:02:45 +00:00
Shuo Qian
3785d3adf8 Merge "Add Call Composer API extras in TelecomManager" am: 6e419a49a7 am: 9a1365f43d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535166

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5539c70ff4019ed4c841155a8ad8bc029bd39344
 2021-01-06 05:02:39 +00:00
David Su
c8694a6ae7 [automerger skipped] frameworks/base/wifi: Add MOVED.txt am: b76a7f609f -s ours 
am skip reason: Change-Id Ib1a017a71c265eba00eae44663fd225ce1bec0f8 with SHA-1 e3d6713d1e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28cff9b09ea1ad8bca64ab18c0f00dd86d0ad9f7
 2021-01-06 04:58:31 +00:00
Automerger Merge Worker
5625f26cdc Merge changes from topic "am-48fce8054ea84f449c45918497754b47" into stage-aosp-master 
* changes:
  Merge "Add CAPABILITY_TYPE_CALL_COMPOSER in MmTelFeature" am: bfd05221a3
  Merge "Add Call Composer Carrier Config keys" am: 4260bc4f95
  Merge "Add call composer Extras for enriched calling" am: a4524a936a
  Merge "Add CAPABILITY_CALL_COMPOSER in PhoneAccount for enriched calling." am: b31c9b4702
  Merge "Add Call Composer API extras in TelecomManager" am: 6e419a49a7
 2021-01-06 04:28:29 +00:00
Shuo Qian
0a832ef9c3 Merge "Add CAPABILITY_TYPE_CALL_COMPOSER in MmTelFeature" am: bfd05221a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535564

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife7647212ee48974d24814a04590fc6402097eff
 2021-01-06 04:25:59 +00:00
Shuo Qian
c9b2ffd7d5 Merge "Add Call Composer Carrier Config keys" am: 4260bc4f95 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535178

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I309da6bef98f4bf88e5090a80ea287ca9eee3896
 2021-01-06 04:23:18 +00:00
Sudheer Shanka
eb17207d84 Merge "Mark PendingIntents created in NPMS as immutable." 2021-01-06 04:12:35 +00:00
Shuo Qian
00ebcdcc5f Merge "Add call composer Extras for enriched calling" am: a4524a936a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535174

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8f600be59e66441764d1e8f4ecb7765b30e1026
 2021-01-06 04:11:56 +00:00
Shuo Qian
83a86a1830 Merge "Add CAPABILITY_TYPE_CALL_COMPOSER in MmTelFeature" am: bfd05221a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535564

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60ffda5fb86b760369e200e8edcc1da5b615821f
 2021-01-06 04:11:19 +00:00
Shuo Qian
53c3ecf481 Merge "Add CAPABILITY_CALL_COMPOSER in PhoneAccount for enriched calling." am: b31c9b4702 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535172

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8cbe93214aefa519d48e003d3b1cafdf65bf021b
 2021-01-06 04:10:15 +00:00
Shuo Qian
fcfa945fd4 Merge "Add Call Composer API extras in TelecomManager" am: 6e419a49a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535166

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1d6387c8d2be47b146b543e80311a29a33d9aab
 2021-01-06 04:07:26 +00:00
Shuo Qian
a1106b08fa Merge "Add Call Composer Carrier Config keys" am: 4260bc4f95 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535178

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7fc3863a2b1ded3399a942417a46848b248087b8
 2021-01-06 04:07:19 +00:00
Shuo Qian
6b65f68685 Merge "Add call composer Extras for enriched calling" am: a4524a936a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535174

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83d1ef814df73d979266419b50f2c1041d4e941f
 2021-01-06 03:55:03 +00:00
Shuo Qian
ce4f99fd74 Merge "Add CAPABILITY_CALL_COMPOSER in PhoneAccount for enriched calling." am: b31c9b4702 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535172

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5998c11bd5f7b8d2168dc353c563790ef9478e2d
 2021-01-06 03:49:09 +00:00
Shuo Qian
9a1365f43d Merge "Add Call Composer API extras in TelecomManager" am: 6e419a49a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535166

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01c845221406e973de92b3d31bc7e2ee0a4fb9fc
 2021-01-06 03:45:02 +00:00
Daniel Bright
5c2d53b15a [automerger skipped] Merge changes from topics "apn_throttle", "rename_retry_interval" am: 1948c69946 am: a36986be6c am: 16d63927bf -s ours 
am skip reason: Change-Id Ia4dd3036f583a97e42b6054019005df1b33dc33c with SHA-1 c47c398475 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee7224340eb4688c15b37538c79fbf2c2c48eb79
 2021-01-06 03:26:40 +00:00
Jack Yu
48fc8a6065 [automerger skipped] Renamed retry interval to retry duration am: 133b7dc759 am: 55fdeddb11 am: 3eb95a64b3 -s ours 
am skip reason: Change-Id I7c4bbe0a77301761525ae793892bb811637027b5 with SHA-1 32ea9e3583 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60b41732784c844a8b79d42b2061bebc3277d923
 2021-01-06 03:26:23 +00:00
Daniel Bright
16d63927bf Merge changes from topics "apn_throttle", "rename_retry_interval" am: 1948c69946 am: a36986be6c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536201

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia81a74e369cb395ff92a2276480015df3e0c9a56
 2021-01-06 03:16:37 +00:00
Jack Yu
3eb95a64b3 Renamed retry interval to retry duration am: 133b7dc759 am: 55fdeddb11 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537161

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie09a1b39e7a09cf9e682b7e42f8a9a104a566a7f
 2021-01-06 03:16:30 +00:00
Ashwini Oruganti
66ed41c35d Merge "Enforce that a PendingIntent has an explicit mutability flag on creation." 2021-01-06 03:04:14 +00:00
Ashwini Oruganti
dd12e9c104 Enforce that a PendingIntent has an explicit mutability 
flag on creation.

This was previously a log.e, this change enforces this requirement.
See go/immutable-pendingintents for more context.

Bug: 160794467
Test: atest PendingIntentTest
Change-Id: If49be614125d7ac7eb556559ff32016f41beaef8
 2021-01-06 03:03:40 +00:00
Soonil Nagarkar
ba3c0ce56b Merge "Refactor Java GNSS HAL" 2021-01-06 02:20:24 +00:00
Daniel Bright
a36986be6c Merge changes from topics "apn_throttle", "rename_retry_interval" am: 1948c69946 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536201

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia80a9e19d92775bf74d6da8ecd4a6dc711c7f923
 2021-01-06 02:19:30 +00:00
Jack Yu
55fdeddb11 Renamed retry interval to retry duration am: 133b7dc759 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537161

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ce350c443a17eb3abc5caa4abb73182d659d96b
 2021-01-06 02:12:25 +00:00
Amy Zhang
232fd17ed1 Merge "Add DvrClient and DvrClientCallback" 2021-01-06 02:06:21 +00:00
Treehugger Robot
5bdd02628d Merge "Keystore 2.0: Android Protected Confirmation" am: 30841f177c am: 3443d2b671 am: ca6272cf1e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508897

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9bb924273fb712efb270e8afbe194604ce1f90ce
 2021-01-06 01:52:47 +00:00
Jeff Sharkey
d6852434c2 Merge "Update OWNERS for ServiceWatcher" am: 7f2de331ac am: 170d46a5e5 am: 5f2d59fd2d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539629

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b46453e5be5e4d1d8e41b746393669abc118612
 2021-01-06 01:52:27 +00:00
Treehugger Robot
cede653d66 Merge "Add OWNERS file for assist structure test" am: 6efe7e60e5 am: 37b781d11c am: ae3b4b9572 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532322

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iefa299c1c8b1a9ff9c0f1daa925d0c7672f0037b
 2021-01-06 01:52:00 +00:00
Soonil Nagarkar
a8e676b326 Refactor Java GNSS HAL 
Extracts large parts of the GNSS HAL into a central GnssNative class,
which can be faked for testing. This is a large step towards making all
GNSS code unit testable, and allows for more modular HAL configurations.
Begins to break up the GnssLocationProvider god object and pull
functionality out into other classes. Changes include:

-Making GnssCapabilities parcelable so it can be part of the API
-Splitting out the NMEA listener from status listeners, which
substantially reduces the burden of supported NMEA listeners as well as
the amount of GNSS<->AP communication.
-All GNSS listeners now respond properly to HAL restarts.
-Partially extract out emergency call detection.

Bug: 153129152
Test: manual
Change-Id: Idee0d548f38c6adf921cd6c28b5d815bbd366f8a
 2021-01-05 17:37:39 -08:00
Treehugger Robot
ca6272cf1e Merge "Keystore 2.0: Android Protected Confirmation" am: 30841f177c am: 3443d2b671 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508897

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I034d45f1afcdd07c0b12e2db7e4134b695ec5c70
 2021-01-06 01:20:59 +00:00
Jeff Sharkey
5f2d59fd2d Merge "Update OWNERS for ServiceWatcher" am: 7f2de331ac am: 170d46a5e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539629

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22a2afd1d601b096f3dfa074d9f15303f6676f21
 2021-01-06 00:54:41 +00:00
Treehugger Robot
ae3b4b9572 Merge "Add OWNERS file for assist structure test" am: 6efe7e60e5 am: 37b781d11c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532322

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61c18a4bd3c8a8cbdfa71e10818f0c087ceb966e
 2021-01-06 00:54:18 +00:00
Treehugger Robot
3443d2b671 Merge "Keystore 2.0: Android Protected Confirmation" am: 30841f177c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508897

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If0d51926f5045c83c12e04ba216f00e7cb287745
 2021-01-06 00:52:32 +00:00
Shuo Qian
bfd05221a3 Merge "Add CAPABILITY_TYPE_CALL_COMPOSER in MmTelFeature" 2021-01-06 00:48:00 +00:00
Shuo Qian
4260bc4f95 Merge "Add Call Composer Carrier Config keys" 2021-01-06 00:48:00 +00:00
Shuo Qian
a4524a936a Merge "Add call composer Extras for enriched calling" 2021-01-06 00:48:00 +00:00