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

402193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
f032d43007 Merge "Consolidate 3 phone icons into one." 2019-01-30 02:11:42 +00:00
Pavel Grafov
2c56686d61 [automerger skipped] Merge "Whitelist packages from VPN lockdown: DPM API." am: c9d834e3f5 am: aade923534 -s ours 
am: 845a1b7be9 -s ours
am skip reason: change_id I7508070f828fb7150df5d9e34846535d57c6a7c3 with SHA1 5cba336daf is in history

Change-Id: Ica8f85aa4e1a7cb47abd90233806fcb3eb1a458d
 2019-01-29 18:10:20 -08:00
TreeHugger Robot
32088bd4e0 Merge "Fix the action string in the manifest" 2019-01-30 02:02:17 +00:00
TreeHugger Robot
0054124f30 Merge "Turn on TimeController job skipping by default." 2019-01-30 02:00:21 +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
Pavel Grafov
845a1b7be9 [automerger skipped] Merge "Whitelist packages from VPN lockdown: DPM API." am: c9d834e3f5 
am: aade923534 -s ours
am skip reason: change_id I7508070f828fb7150df5d9e34846535d57c6a7c3 with SHA1 5cba336daf is in history

Change-Id: Ic053580559dbe0733a19c2d74fab3fba374428ba
 2019-01-29 17:52:14 -08:00
Pavel Grafov
aade923534 Merge "Whitelist packages from VPN lockdown: DPM API." 
am: c9d834e3f5

Change-Id: I5723a0970a0e37995c9db6e42ae527b8692bc48a
 2019-01-29 17:41:49 -08:00
Treehugger Robot
c9d834e3f5 Merge "Whitelist packages from VPN lockdown: DPM API." 2019-01-30 01:29:45 +00:00
Kevin Chyn
4607116f48 Merge "Add require_confirmation to BiometricAuthenticated atom" 2019-01-30 01:28:04 +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
Chavi Weingarten
e82defc28e Merge "Make WindowContainer surfaces container layers by default." 2019-01-30 01:12:39 +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
TreeHugger Robot
b7c7d89155 Merge "Reduced down slop and added action for expanding notifications (1/2)" 2019-01-30 00:36:59 +00:00
Julia Reynolds
d81e517057 Merge "Don't recommend downranking _HIGH notifications" 2019-01-30 00:35:11 +00:00
Chen Xu
74798a771a Merge "Add IntRange and FloatRange annotations" 
am: 94a9377222

Change-Id: Iab472ad2c0ffe875069ea7b71ce10a14e9ef70f5
 2019-01-29 16:32:21 -08:00
TreeHugger Robot
bcd8465a77 Merge "Import translations. DO NOT MERGE" 2019-01-30 00:27:33 +00:00
TreeHugger Robot
1931fa5033 Merge "Fixes an issue where users could be stuck with heads up notifications" 2019-01-30 00:21:20 +00:00
Evan Laird
a194630221 Merge "Add StatusBarManager#disableForSetup(boolean) @SystemApi" 2019-01-30 00:20:19 +00: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
TreeHugger Robot
9e3e683da4 Merge "Import translations. DO NOT MERGE" 2019-01-30 00:11:27 +00:00
Chen Xu
94a9377222 Merge "Add IntRange and FloatRange annotations" 2019-01-30 00:06:23 +00:00
Jordan Liu
06bc048480 Merge "Merge "Card ID APIs are public" am: bd4a4dc889" into stage-aosp-master am: 22a8239b6a 
am: 3b58fcd318

Change-Id: I5c2e4dcaee9d608d12f513073ae0f137aa2798e6
 2019-01-29 15:53:37 -08:00
Mathieu Chartier
88819f07e0 Merge "Add handling for preferCodeIntegrity" 2019-01-29 23:45:55 +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
3b58fcd318 Merge "Merge "Card ID APIs are public" am: bd4a4dc889" into stage-aosp-master 
am: 22a8239b6a

Change-Id: If3f27b835cacaff13d19d8dbe36d59b4f2265439
 2019-01-29 15:32:12 -08:00
TreeHugger Robot
895ce08d6b Merge "Migrate dialer to RoleManager" 2019-01-29 23:28:16 +00:00
Amin Shaikh
f3a942751a Consolidate 3 phone icons into one. 
ic_bt_cellphone, ic_volume_voice, ic_phone_24dp -> ic_phone

Bug: 122263617
Test: make
Change-Id: Id3a518209e78d1f51b3cc1945bcbeba1bdcb2e23
 2019-01-29 18:23:55 -05: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
Paul Crowley
ddf391d46b [automerger skipped] Merge "v3 keys use SP800 derivation" into pi-dev am: 83924aca2c 
am: 930efcaf19 -s ours
am skip reason: change_id Ia5bdc9acaa8d37605088abcfb0037581eb6494c2 with SHA1 0d40d6e787 is in history

Change-Id: Idab71018ff09c4c962716078a5c472598f8568c6
 2019-01-29 15:17:23 -08:00
Android Build Merger (Role)
22a8239b6a Merge "Merge "Card ID APIs are public" am: bd4a4dc889" into stage-aosp-master 2019-01-29 23:14:51 +00:00
Jordan Liu
009b88526f Merge "Card ID APIs are public" 
am: bd4a4dc889

Change-Id: Ie436f74a0501d46ac12ea641ab71741fc6cbf3ba
 2019-01-29 15:13:25 -08:00
Jordan Liu
a039e692a4 Merge "Card ID APIs are public" 
am: bd4a4dc889

Change-Id: I2cf670328f7b2f35d6009eecb0e3741311d6e2df
 2019-01-29 15:06:01 -08:00
TreeHugger Robot
3e8a69cd9d Merge "Fix typo: decrement not increment" 2019-01-29 22:49:22 +00:00
TreeHugger Robot
e2c6ce4b0b Merge "Log notification location and assistant-generated when smart reply sent" 2019-01-29 22:46:44 +00: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
TreeHugger Robot
0f878e30bb Merge "Log a warning if non-role holder attempts to read sms" 2019-01-29 22:44:14 +00:00
Jordan Liu
bd4a4dc889 Merge "Card ID APIs are public" 2019-01-29 22:43:47 +00:00
Paul Crowley
930efcaf19 Merge "v3 keys use SP800 derivation" into pi-dev 
am: 83924aca2c

Change-Id: I4d74a329823a05473089936cb2f6907aeda56013
 2019-01-29 14:41:51 -08:00
Kweku Adams
ab8a901823 Turn on TimeController job skipping by default. 
There was a bug in JobStatus.wouldBeReadyWithConnectivity where
precomputed booleans weren't reconsidered when appropriate. This
affected implicit constraints but most directly affected queries
for the DEADLINE, which would then incorrectly return false when
it could have returned true.

Bug: 123539027
Test: atest com.android.server.job.controllers.JobStatusTest
Test: atest TimingConstraintsTest
Change-Id: Iee6c4e507c25a2ada39dbbcb8e5cc12dc9cf64c2
 2019-01-29 14:36:52 -08:00
TreeHugger Robot
6296773cd0 Merge "Camera: Unhide Key constructors" 2019-01-29 22:35:45 +00:00
TreeHugger Robot
1ebc40339a Merge "Revert "Add android.hardware.fingerprint for pre-Q"" 2019-01-29 22:23:21 +00:00
TreeHugger Robot
526e9a00da Merge "FEATURE_FINGERPRINT is back to android.hardware.fingerprint" 2019-01-29 22:23:21 +00:00
TreeHugger Robot
c1cebf5d51 Merge "Add FontNotoSerifSourceOverlay to AOSP." 2019-01-29 22:21:30 +00:00
Josh Tsuji
9b53de5736 Merge "Adds shadows and a default background color to Bubbles." 2019-01-29 22:20:16 +00:00
Android Build Merger (Role)
2d10bd0481 Merge "Merge "Whitelist packages from VPN lockdown: DPM API." into pi-dev-plus-aosp am: 299f825678" 2019-01-29 22:14:24 +00:00