Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
402,303 Commits 3 Branches 0 Tags
4e2fd163ebabe15246b71aaf5e2bc0525402132e
Commit Graph

23055 Commits

Author SHA1 Message Date
TreeHugger Robot
3186185050 Merge "Made ContentCapture's UserDataRemovalRequest getters public." 2019-01-30 11:32:37 +00:00
Android Build Merger (Role)
17c5c14f38 Merge changes from topic "am-abce5681da074e3fa5a9a6b85cf6ce68" 
* changes:
  [automerger skipped] Merge "API: Fix missing @NonNull annotations" am: b852f6636f am: d1f5939c1a am: 5918a1cb6b -s ours am skip reason: change_id Ia7589dfcc7f63923890e609dbf03175d2b035d29 with SHA1 918c4f1043 is in history
  Merge "API: Add missing nullability annotations" am: e148fbcf03 am: 336e11018e am: aaeb5c1201
 2019-01-30 10:39:45 +00:00
Adrian Roos
68a993b75b Merge "API: Add missing nullability annotations" am: e148fbcf03 am: 336e11018e 
am: aaeb5c1201

Change-Id: I0fdde8f76a00a9f019629a71de4a78fb790176d4
 2019-01-30 02:31:31 -08:00
Richard Uhler
8ffae36fa9 Merge "Rename RollbackInfo.getSessionId to getCommittedSessionId." 2019-01-30 10:29:04 +00:00
Adrian Roos
aaeb5c1201 Merge "API: Add missing nullability annotations" am: e148fbcf03 
am: 336e11018e

Change-Id: Idb6cbb94968f4a2ffe3055291f23fc903fe923a0
 2019-01-30 02:12:37 -08:00
Adrian Roos
e148fbcf03 Merge "API: Add missing nullability annotations" 2019-01-30 09:31:58 +00:00
Felipe Leme
6f6bdae72d Made ContentCapture's UserDataRemovalRequest getters public. 
Test: m update-api
Test: atest CtsContentCaptureServiceTestCases

Fixes: 123597549

Change-Id: Ibb35f860e97bb4b7f6aa564a7b2cfccbc9e041d4
 2019-01-30 01:08:23 -08:00
Michele Berionne
adb7ee97e4 Merge "Add APIs to get/set if usage of multiple SIMs is restricted." am: 59133875e7 
am: e01966e89b

Change-Id: I383b701bff4c77596fad1d72929a5afcc5b0cf56
 2019-01-29 22:42:29 -08:00
Michele Berionne
59133875e7 Merge "Add APIs to get/set if usage of multiple SIMs is restricted." 2019-01-30 06:18:19 +00:00
TreeHugger Robot
fdf4384585 Merge "Removed unused flag from notifyTextChanged()." 2019-01-30 05:40:33 +00:00
Nazanin Bakhshi
2040dcffa3 Merge "Add telephony API to switch multi sim config" 2019-01-30 05:15:20 +00:00
TreeHugger Robot
b391c999d8 Merge "Add Bitmap#getColor" 2019-01-30 04:19:32 +00:00
Les Lee
1b396fa0af Merge "Restrict wifi p2p broadcasts" 2019-01-30 03:42:55 +00:00
TreeHugger Robot
78ae2b5bb6 Merge "Skeleton API for IncidentManager to retrieve incident reports." 2019-01-30 03:30:40 +00:00
Mingguang Xu
7b8b30b4c2 Merge "Wifi usability: Add link probe results and rx link speed into usability stats" 2019-01-30 03:20:50 +00:00
TreeHugger Robot
195bafa151 Merge "Bluesky add position uncertainty field" 2019-01-30 03:14:47 +00:00
TreeHugger Robot
0544b1ac87 Merge "Get ProtoOutputStream size without compressing it" 2019-01-30 02:32:49 +00:00
TreeHugger Robot
1444690e53 Merge changes I1d901692,I3e0bca75 
* changes:
  ControllerLink: Remove unused parameter asSystemService
  MediaController: Remove dispatching key event as system service APIs
 2019-01-30 01:53:50 +00:00
Nazanin Bakhshi
1e031bde1a Add telephony API to switch multi sim config 
Bug: 122115649
Test: sanity
Change-Id: Idace8ed7f3fe78a6ce831225bda499a58a34c80f
 2019-01-29 17:39:58 -08:00
Michele
233d6b292f Add APIs to get/set if usage of multiple SIMs is restricted. 
Add API that indicates if the usage of multiple SIMs at the same time is
allowed or restricted in order to support requirements from carriers for
dual SIM devices

Bug: 123537730
Test: Verified with test application.
Change-Id: I5e3e5ff41927e43ead4a30988630cf9125d5a048
Merged-In: I5e3e5ff41927e43ead4a30988630cf9125d5a048
(cherry picked from commit 398d5d9113)
 2019-01-29 17:38:23 -08:00
Treehugger Robot
c9d834e3f5 Merge "Whitelist packages from VPN lockdown: DPM API." 2019-01-30 01:29:45 +00:00
Mathieu Chartier
4625b2e489 Merge "Add runtime_native namespace for properties" 2019-01-30 01:15:36 +00:00
Michele Berionne
19939bdbe0 Merge "Add APIs to get/set if usage of multiple SIMs is restricted." 2019-01-30 01:14:22 +00:00
Android Build Merger (Role)
664d979587 Merge "Merge "Add IntRange and FloatRange annotations" am: 94a9377222 am: 74798a771a am: 7c3084c349" 2019-01-30 01:05:05 +00:00
Chen Xu
60a12e3118 Merge "Add IntRange and FloatRange annotations" am: 94a9377222 am: 74798a771a 
am: 7c3084c349

Change-Id: Ic838b99e169e2fd144e51199e41560efdf663fea
 2019-01-29 17:04:30 -08:00
TreeHugger Robot
d070768d8d Merge "Move MediaMetadata class back to framework" 2019-01-30 01:04:04 +00:00
Chen Xu
7c3084c349 Merge "Add IntRange and FloatRange annotations" am: 94a9377222 
am: 74798a771a

Change-Id: I6353003144e4c2cf5882d20d2d37921dc69b4bcf
 2019-01-29 16:43:48 -08:00
Felipe Leme
35ea763042 Removed unused flag from notifyTextChanged(). 
(and also fixed typo on hidden constant)

Test: m update-api
Test: atest CtsContentCaptureServiceTestCases
Fixes: 123598012

Change-Id: I63ccb60cf8eebe6b5ef6d7961dbb0ac8be088eda
 2019-01-29 16:32:56 -08:00
Evan Laird
a194630221 Merge "Add StatusBarManager#disableForSetup(boolean) @SystemApi" 2019-01-30 00:20:19 +00:00
gomo
6ec9538233 Bluesky add position uncertainty field 
Add the horizontal position uncertainty for the provided location
by Bluesky at which the corrections are computed.

Bug: 111441283
Test: Existing tests pass.
Change-Id: I396bfce10deb9561b9f4d128b1f6a9641dedc3cc
 2019-01-29 16:20:13 -08:00
Evan Laird
3cc59ebe93 Merge "Remove @hide from top-level StatusBarManager" 2019-01-30 00:19:19 +00:00
Mathieu Chartier
7f11eb9057 Add runtime_native namespace for properties 
Create a namespace for runtime native properties, java language
properties will be added in a later CL.

Bug: 111397239
Bug: 120794191
Bug: 123524494

Test: adb shell device_config put runtime_native gctype CC,preverify
Test: verify the property is set correctly
Exempt-From-Owner-Approval: Previously approved

Change-Id: I84ec84f0befdbf778b9cef43991b63fbab3b0943
 2019-01-30 00:15:59 +00:00
Joe Onorato
8daca75889 Skeleton API for IncidentManager to retrieve incident reports. 
Bug: 123543706
Test: make
Change-Id: I0a41d476703cb0c1c728c6de1bf290162129e699
 2019-01-29 16:10:44 -08:00
Chen Xu
94a9377222 Merge "Add IntRange and FloatRange annotations" 2019-01-30 00:06:23 +00:00
Jordan Liu
9824ab022b Merge "Card ID APIs are public" am: bd4a4dc889 am: a039e692a4 
am: 316dc44a91

Change-Id: Ibb4966a27a96f1e50b42f616556a4e843050557a
 2019-01-29 15:42:07 -08:00
Jordan Liu
316dc44a91 Merge "Card ID APIs are public" am: bd4a4dc889 
am: a039e692a4

Change-Id: I6041944772567794b79a355c9f77767ed61c0f76
 2019-01-29 15:18:21 -08:00
Adam He
b278ec3836 Merge changes from topics "dsiable_settings_2", "disable_cc_settings" 
* changes:
  Added new APIs to let ContentCaptureService enable / disable the feature.
  Added new APIs to let Settings enable / disable ContentCapture
 2019-01-29 22:46:24 +00:00
Jordan Liu
bd4a4dc889 Merge "Card ID APIs are public" 2019-01-29 22:43:47 +00:00
TreeHugger Robot
6296773cd0 Merge "Camera: Unhide Key constructors" 2019-01-29 22:35:45 +00:00
TreeHugger Robot
526e9a00da Merge "FEATURE_FINGERPRINT is back to android.hardware.fingerprint" 2019-01-29 22:23:21 +00:00
Pavel Grafov
0c0af4b0cc Merge "Whitelist packages from VPN lockdown: DPM API." into pi-dev-plus-aosp 
am: 299f825678

Change-Id: I3deb4a865e109e2b2e67dc7d8ffc775747f34303
 2019-01-29 14:13:19 -08:00
chen xu
e0a3eb90d9 Add IntRange and FloatRange annotations 
Bug: 123223163
Test: Build
Change-Id: I17f27075007df642ec93e5b762b0717da4a1e927
 2019-01-29 13:58:29 -08:00
Philip P. Moltmann
5fb9cef346 Merge "New device config to enable location perm re-up" 2019-01-29 21:55:12 +00:00
Pavel Grafov
2b60849c5c Whitelist packages from VPN lockdown: DPM API. 
Bug: 77468593
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpn
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpnAcrossReboot
Change-Id: I7508070f828fb7150df5d9e34846535d57c6a7c3
Merged-In: I7508070f828fb7150df5d9e34846535d57c6a7c3
 2019-01-29 21:49:07 +00:00
TreeHugger Robot
299f825678 Merge "Whitelist packages from VPN lockdown: DPM API." into pi-dev-plus-aosp 2019-01-29 21:44:13 +00:00
Gustav Sennton
78ce9ed65b Merge "Update the notification_assistant DeviceConfig namespace." 2019-01-29 21:05:47 +00:00
Michele
398d5d9113 Add APIs to get/set if usage of multiple SIMs is restricted. 
Add API that indicates if the usage of multiple SIMs at the same time is
allowed or restricted in order to support requirements from carriers for
dual SIM devices

Bug: 123537730
Test: Verified with test application.
Change-Id: I5e3e5ff41927e43ead4a30988630cf9125d5a048
 2019-01-29 12:56:53 -08:00
Sooraj Sasindran
d42041fe96 Merge "Define more thresholds for opportunistic data" am: cf2e069962 
am: c3bf9392ac

Change-Id: I44cd2e063fd5587ee7abf77e22acca7b08953a02
 2019-01-29 12:21:17 -08:00
Amith Yamasani
173af94d25 Merge "Introduce a new process state for location fg service" 2019-01-29 20:07:13 +00:00
Sooraj Sasindran
cf2e069962 Merge "Define more thresholds for opportunistic data" 2019-01-29 19:43:26 +00:00