Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
628,833 Commits 3 Branches 0 Tags
7ddd1bd457efbe8ebfdb44872d2fe2e1186b048b
Commit Graph

628833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
7ddd1bd457 Merge "[SettingsProvider] do not check @Readable for system/priv apps in the server" into sc-dev 2021-03-11 20:17:56 +00:00
Lyn Han
0ec8d259d5 Merge "Remove section headers for non-silent notifications" into sc-dev 2021-03-11 19:57:33 +00:00
Daniel Bright
73664efd4d Merge "Update comments on onApnUnthrottled" am: 1bec754c8b am: bb58b8a819 am: 27a0642a9b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e82b82be6bcc201829b6dbb17186b98f7862a77
 2021-03-11 19:54:07 +00:00
Brian Quezada
da2faff59c Merge "Fix dim duration on flip to screen off." into sc-dev 2021-03-11 19:52:40 +00:00
TreeHugger Robot
a6907d35ea Merge "End the trace section in FrameTracker#cancel if it has begun" into sc-dev 2021-03-11 19:48:59 +00:00
Daniel Bright
27a0642a9b Merge "Update comments on onApnUnthrottled" am: 1bec754c8b am: bb58b8a819 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iafbd99a78e3cf47d5a265a88978e2a1a9e25cb70
 2021-03-11 19:07:29 +00:00
Neil Fuller
8529a9ba31 Merge "Add MetricsTimeZoneSuggestion for metrics use" am: c06b300638 am: 288f5630c1 am: 8a71bbc85f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If591e7ffda0bac9c320d4b2b3d3939b0a2a69cd1
 2021-03-11 18:52:49 +00:00
Neil Fuller
1a042c9958 Merge "OWNERS change / new .proto file" am: 6d3fb3d57c am: 6ca6f593a1 am: d34bf7100d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628819

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8635a998a94b03dac597b7ab45de99a62488a680
 2021-03-11 18:52:08 +00:00
James Mattis
407fd06a54 Merge "Add auto-postsubmit test tag for frameworks/base" am: ec14bafb25 am: 987d246395 am: c8cf0becf0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626462

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0586b18d6e02e54e9eb0742c847b9523cf34a64b
 2021-03-11 18:51:10 +00:00
Felipe Leme
120baf0f47 Merge "Improved ShortcutManagerTestUtils. getDefaultLauncher() in case of error." into sc-dev 2021-03-11 18:48:34 +00:00
Daniel Bright
bb58b8a819 Merge "Update comments on onApnUnthrottled" am: 1bec754c8b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4de8a5e489211dcaa469608a04ac07d70afb7391
 2021-03-11 18:29:33 +00:00
Neil Fuller
8a71bbc85f Merge "Add MetricsTimeZoneSuggestion for metrics use" am: c06b300638 am: 288f5630c1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7c9657c803ab1d292c203732ce6036cc3edda21
 2021-03-11 18:12:15 +00:00
Neil Fuller
d34bf7100d Merge "OWNERS change / new .proto file" am: 6d3fb3d57c am: 6ca6f593a1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628819

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35dae3f53d34a1fb0628503857659bf394e07779
 2021-03-11 18:12:01 +00:00
James Mattis
c8cf0becf0 Merge "Add auto-postsubmit test tag for frameworks/base" am: ec14bafb25 am: 987d246395 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626462

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I501cb60a1f805215970d16e27fe741605c1389b9
 2021-03-11 18:11:29 +00:00
Daniel Bright
1bec754c8b Merge "Update comments on onApnUnthrottled" 2021-03-11 18:02:36 +00:00
Neil Fuller
288f5630c1 Merge "Add MetricsTimeZoneSuggestion for metrics use" am: c06b300638 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6166e51e6c323c6f0ae46a0515189468ce897ba6
 2021-03-11 17:46:17 +00:00
Neil Fuller
6ca6f593a1 Merge "OWNERS change / new .proto file" am: 6d3fb3d57c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628819

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cbee2d8c4938aca3045f22c61c03b9961faac7a
 2021-03-11 17:43:27 +00:00
Neil Fuller
c06b300638 Merge "Add MetricsTimeZoneSuggestion for metrics use" 2021-03-11 17:38:30 +00:00
Janis Danisevskis
d3035fe485 Merge "Keystore 2.0: Remove hidden API from RecoverableKeystore" am: 5de808c5e2 am: 8b7ca71fd7 am: 2a38d13272 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624871

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11523cbe76bba7f92ab1c4929eea502bf8e5a61b
 2021-03-11 17:37:47 +00:00
James Mattis
987d246395 Merge "Add auto-postsubmit test tag for frameworks/base" am: ec14bafb25 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626462

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica56ddfb4e4320ab5e553856b9ef3abf88add266
 2021-03-11 17:33:52 +00:00
TreeHugger Robot
43b70deccb Merge "Add genrules for merged system server stubs" into sc-dev 2021-03-11 17:33:07 +00:00
Neil Fuller
6d3fb3d57c Merge "OWNERS change / new .proto file" 2021-03-11 17:12:18 +00:00
James Mattis
ec14bafb25 Merge "Add auto-postsubmit test tag for frameworks/base" 2021-03-11 17:05:34 +00:00
Eric Laurent
5bcb005a76 Merge "AudioManager: update javadoc for setCommunicationDevice" into sc-dev 2021-03-11 17:02:17 +00:00
Janis Danisevskis
2a38d13272 Merge "Keystore 2.0: Remove hidden API from RecoverableKeystore" am: 5de808c5e2 am: 8b7ca71fd7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624871

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41a1d4c746b1bc390a6060f526b90580d3f2397a
 2021-03-11 16:56:41 +00:00
Almaz Mingaleev
ccc3f97602 Merge "Fix TimeDetectorServiceTest." into sc-dev 2021-03-11 16:49:10 +00:00
Lucas Dupin
9d74d245e4 Merge "Hide ripple style APIs" into sc-dev 2021-03-11 16:40:18 +00:00
Kweku Adams
76cb4a212b Merge "Increase max job limit to 150." into sc-dev 2021-03-11 16:26:33 +00:00
Janis Danisevskis
8b7ca71fd7 Merge "Keystore 2.0: Remove hidden API from RecoverableKeystore" am: 5de808c5e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624871

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ccf99568c8238256addc02982a9b63757a7a22e
 2021-03-11 16:18:12 +00:00
Flavio Fiszman
04c28ba44f Merge "Handle onAppWidgetOptionsChanged widget add" into sc-dev 2021-03-11 15:59:34 +00:00
Janis Danisevskis
5de808c5e2 Merge "Keystore 2.0: Remove hidden API from RecoverableKeystore" 2021-03-11 15:50:32 +00:00
Michal Olech
9a49890e69 Merge "[CEC Configuration] Add @SystemApi for all remaining settings" into sc-dev 2021-03-11 15:45:57 +00:00
Rafal Slawik
708645934e Merge "Fix: pass frequency as int" into sc-dev 2021-03-11 15:38:30 +00:00
bquezada
2dccad6f94 Fix dim duration on flip to screen off. 
Timeouts are calculated from mLastUserActivityTime, so just calling updatePowerStateLocked will go to locked with almost no dim duration.

Test: Tested with local device.

Bug: 164517126
Change-Id: I084c13fada7613bd745ceb1dc2f7038097d70686
 2021-03-11 15:08:09 +00:00
TreeHugger Robot
01ab7bcd20 Merge "Controls in QS" into sc-dev 2021-03-11 15:04:27 +00:00
Neil Fuller
b2973f8213 Add MetricsTimeZoneSuggestion for metrics use 
This tracks an internal change.

Bug: 172934905
Test: build / boot / treehugger
Change-Id: I94ab695250cc7d0db294628f9578f3ffa77b998d
 2021-03-11 14:34:33 +00:00
Neil Fuller
c3c171cbe5 OWNERS change / new .proto file 
Splitting out GeolocationTimeZoneSuggestionProto to
time_zone_detector.proto.

Test: build only
Bug: 172934905
Change-Id: Ib7798955ae7ab3a486aa33d2bed85f4bbd8511e1
 2021-03-11 14:28:59 +00:00
Almaz Mingaleev
d3207f94dd Fix TimeDetectorServiceTest. 
Wrong method was mocked. Also tests were not run under TH,
that is being addressed.

Bug: 182461754
Test: atest services/tests/servicestests/src/com/android/server/timedetector/*
Change-Id: Ic5c004dcb06ef68e89bc4f32c2cfc92ec6ce5060
 2021-03-11 14:26:42 +00:00
Joanne Chung
9b316222ff Merge "Add debug logs to help clarify the issue" into sc-dev 2021-03-11 14:03:23 +00:00
Flavio Fiszman
af8cc8d0ee Handle onAppWidgetOptionsChanged widget add 
Change-Id: I2df633086c61d973effec4dbe54a691ac31125f3
Test: PeopleSpaceUtilsTest and PeopleSpaceWidgetManagerTest
Bug: 182265091
 2021-03-11 13:58:01 +00:00
Beverly Tai
384db6dd05 Merge "Add quickpickup gesture" into sc-dev 2021-03-11 13:35:56 +00:00
Rafal Slawik
03b473db35 Fix: pass frequency as int 
Frequency should be passed as an int to match the field type declared in
the atom.

Bug: 182375361
Test: existing tests pass
Test: atest CpuStatsTests
Test: cmd stats pull-source 10095
Change-Id: I6ef06874dd8acafa74def4dae7035c9bf3cd764d
 2021-03-11 13:35:17 +00:00
TreeHugger Robot
e8eaea0ef2 Merge "Documentation fix: Permission grant opt-out" into sc-dev 2021-03-11 13:26:20 +00:00
Lorenzo Colitti
f8d3be378f Merge "Don't start clatd if disabled by vendor property." am: a517079da0 am: c147019ab2 am: 67b99e7bee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6989361f1dae72cb94d6e6cf6144ae61cb80c328
 2021-03-11 13:02:29 +00:00
Rafal Slawik
d25b292633 Merge "Add missing AMC reviewers" am: 7bc8d20b51 am: 19bc7824dc am: a0351a0708 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626439

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d47ff6e5227fcdd307b99c2ca99208944d4784d
 2021-03-11 13:01:50 +00:00
Treehugger Robot
2bfebf3c69 Merge "Keystore 2.0: Rename KeystoreUserManagement KeystoreMaintenance" am: 721f75ec5a am: 2172f58763 am: 49e95446fe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623080

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id87860c4d3741a78a5b7aa8bb67931e5c8581e59
 2021-03-11 13:01:02 +00:00
Yo Chiang
b3881305c5 Merge "Ignore InterruptedException from Thread.sleep()" am: ffdc8928ac am: 6fe70ef0c1 am: e9a848ea57 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541644

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34e7d3ec350fc88b18cce4df166761e2ec69e086
 2021-03-11 13:00:40 +00:00
Marcin Oczeretko
de541b0e4a Merge "Rename LatencyTracker config flags to follow the convention" into sc-dev 2021-03-11 12:59:46 +00:00
Lorenzo Colitti
67b99e7bee Merge "Don't start clatd if disabled by vendor property." am: a517079da0 am: c147019ab2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I333fba0c9bca40f0cd60d042b4c6ed82e72abaa9
 2021-03-11 12:55:46 +00:00
TreeHugger Robot
dabf902d0d Merge "Cleanup: use nullptr instead of NULL" into sc-dev 2021-03-11 12:41:09 +00:00