Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
576,777 Commits 3 Branches 0 Tags
432e984e3410c4ffd7cb00a206f233754c5abc4d
Commit Graph

576777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
432e984e34 Merge "Add missing @FloatRange" 2020-08-19 20:39:15 +00:00
Nazanin Bakhshi
c04c6be6d9 Merge "initialized carrier_certificate_string_array to an empty array instead of null, so that when a certificate is removed, it is also removed in SubscriptionInfoUpdater#updateSubscriptionByCarrierConfig" 2020-08-19 18:55:56 +00:00
TreeHugger Robot
53f2a5f9c4 Merge "DPMS: Allow DO to call cross-profile methods" 2020-08-19 18:25:10 +00:00
TreeHugger Robot
dded6c93d6 Merge "Don't create a file with empty favorites" 2020-08-19 18:17:53 +00:00
John Reck
ac6fc83063 Add missing @FloatRange 
Test: none
Fixes: 121220209
Change-Id: Ifcc090414cd885817dfc88d9c059a1a70c305fe1
 2020-08-19 11:13:22 -07:00
TreeHugger Robot
8d245a427d Merge "AudioService: Fix mute issue when changing audio routes" 2020-08-19 18:04:34 +00:00
TreeHugger Robot
968e2483d3 Merge "Add "uinput" command to support uinput device." 2020-08-19 18:04:08 +00:00
Winson Chung
7d4b51d276 Merge "Add mechanism to register single task organizer" 2020-08-19 17:56:45 +00:00
Julia Reynolds
7dafd21f26 Merge changes I24ba9196,Idc983746 
* changes:
  Fix some l18n issues
  Add more info to log statement
 2020-08-19 17:52:51 +00:00
Julia Reynolds
4307ce022e Fix some l18n issues 
Test: manual in different locales
Fixes: 159638928
Fixes: 159164084

Change-Id: I24ba91962cafd1fd2bd2b7e434f1312833cb69bc
 2020-08-19 17:38:57 +00:00
Kweku Adams
dcca9929b1 Merge "Allow package verifier to hide specific fgs notifications." into rvc-qpr-dev am: 1706f9c22f am: 769c4f6830 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12378562

Change-Id: I38c2c79c41cb82c432fc904f3923625c1f4216c2
 2020-08-19 17:37:47 +00:00
Kweku Adams
769c4f6830 Merge "Allow package verifier to hide specific fgs notifications." into rvc-qpr-dev am: 1706f9c22f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12378562

Change-Id: I49a977a18f40504b7bea8e0280d975cccb18c897
 2020-08-19 17:25:05 +00:00
Anna Malova
617461b31c Merge "Use Network object instead of network handle and expand documentation." 2020-08-19 17:16:00 +00:00
Kweku Adams
1706f9c22f Merge "Allow package verifier to hide specific fgs notifications." into rvc-qpr-dev 2020-08-19 17:14:33 +00:00
Kweku Adams
4d4ca713e8 Merge "Migrate initial set of flags to DeviceConfig." 2020-08-19 17:07:35 +00:00
Agatha Man
96b7aafd40 Merge "system server watchdog caused by deadlock" into rvc-qpr-dev am: e48401c147 am: 70c529300c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12363488

Change-Id: I48f64530e2f56d1816ecb06a1270e9c68603edbd
 2020-08-19 16:59:26 +00:00
Fabian Kozynski
9c892d30f1 Don't create a file with empty favorites 
A file could be created with empty favorites, preventing a late restore
(from D2D) from overwriting it.

Test: atest ControlsFavoritePersistenceWrapperTest
Test: manual D2d restore
Bug: 165200632
Change-Id: Ia99b8e98e4f62d8d0c7385c820c645f3aaabe6f3
 2020-08-19 12:57:19 -04:00
Agatha Man
70c529300c Merge "system server watchdog caused by deadlock" into rvc-qpr-dev am: e48401c147 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12363488

Change-Id: I9a412a97425008e1aeba0110e8f5c0b69e4a8150
 2020-08-19 16:47:37 +00:00
Eran Messeri
05c46754d8 DPMS: Allow DO to call cross-profile methods 
As a part of Change-ID I5fc3345101c8f61c12a9bbdbd224e95e719a0795,
cross-profile related methods were restricted to Profile Owner DPCs.

As it turns out, some DPCs call these methods in DO mode as well.
Revert the behaviour to allow DO DPC to call these methods (even if they
have no effect).

Bug: 165592830
Test: atest com.android.cts.devicepolicy.MixedDeviceOwnerTest FrameworksServicesTests:DevicePolicyManagerTest com.android.cts.devicepolicy.MixedProfileOwnerTest
Change-Id: I1b206ccfa963a615f361cee9b77c5049328a2596
 2020-08-19 17:43:49 +01:00
Jean-Michel Trivi
1def04cc0b AudioService: Fix mute issue when changing audio routes 
When audio device routing changes, verify that streams now routed via
fixed/full volume properly update volume index and mute state to ensure
the user does not get into a state where the stream is muted, but full
volume behavior does not allow mute changes.

AudioService#onObserveDevicesForAllStreams() is called as a result of AudioDeviceInventory#onReportNewRoutes().

Bug: 162480816
Test: see repro on bug with muting/unmuting scenario
Change-Id: I60b3b75a3ccb4a0d68ea797d177abb032f82bb91
 2020-08-19 09:43:29 -07:00
TreeHugger Robot
70868253b6 [automerger skipped] Merge "Correct the return value of applyAnimationLocked." into rvc-d1-dev am: af90f3fe7e am: d58e211dec -s ours am: 24a0a25dc6 -s ours 
am skip reason: Change-Id I69bcd29f2587a3644485a0db05e622f6775cc82f with SHA-1 48288a505d is in history

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

Change-Id: I9e62c8d03c18885e270ffc85824541a5aa9867a6
 2020-08-19 16:42:16 +00:00
TreeHugger Robot
c602a5f375 [automerger skipped] Merge "Correct the return value of applyAnimationLocked." into rvc-d1-dev am: af90f3fe7e am: 5d713e0068 am: 8cb6b81875 -s ours 
am skip reason: Change-Id I69bcd29f2587a3644485a0db05e622f6775cc82f with SHA-1 ec4642a9b6 is in history

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

Change-Id: Ic94b99d3bd35f32196e59809f6d1df53b890d0e4
 2020-08-19 16:41:32 +00:00
Agatha Man
e48401c147 Merge "system server watchdog caused by deadlock" into rvc-qpr-dev 2020-08-19 16:37:48 +00:00
TreeHugger Robot
24a0a25dc6 [automerger skipped] Merge "Correct the return value of applyAnimationLocked." into rvc-d1-dev am: af90f3fe7e am: d58e211dec -s ours 
am skip reason: Change-Id I69bcd29f2587a3644485a0db05e622f6775cc82f with SHA-1 48288a505d is in history

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

Change-Id: Ic6334a8f67cb883b508b3d49600d697778047b71
 2020-08-19 16:34:33 +00:00
TreeHugger Robot
8cb6b81875 Merge "Correct the return value of applyAnimationLocked." into rvc-d1-dev am: af90f3fe7e am: 5d713e0068 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12383608

Change-Id: I544d0b6a083ca903f3932a7a6b239b72aa7d2324
 2020-08-19 16:29:15 +00:00
Tiger Huang
5cdb31646a [automerger skipped] Update requested state after applying pending frames am: 23c75281ef -s ours am: 4ae3c0adba -s ours am: f9e0eb0857 -s ours 
am skip reason: Change-Id Id8f3c1956fbfe3ad16f167ff76297dde6c634e81 with SHA-1 23c75281ef is in history

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

Change-Id: I6ef8bc74d62c4410d1fb49f6e8afa6629683fdda
 2020-08-19 16:19:55 +00:00
TreeHugger Robot
d58e211dec Merge "Correct the return value of applyAnimationLocked." into rvc-d1-dev am: af90f3fe7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12383608

Change-Id: I867ca42c8af309369b0da2c497e9b98bd48d29d6
 2020-08-19 16:19:51 +00:00
TreeHugger Robot
5d713e0068 Merge "Correct the return value of applyAnimationLocked." into rvc-d1-dev am: af90f3fe7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12383608

Change-Id: I3aa2622519e40e499c358f57c4bbf22da7a2da21
 2020-08-19 16:19:48 +00:00
Tiger Huang
402f23c7ff [automerger skipped] Update requested state after applying pending frames am: 23c75281ef am: 02b0205641 -s ours am: 328d06eee4 -s ours 
am skip reason: Change-Id Id8f3c1956fbfe3ad16f167ff76297dde6c634e81 with SHA-1 1a53789bc8 is in history

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

Change-Id: I9292703c416596e8dee8b980de907862fead52ca
 2020-08-19 16:19:21 +00:00
Tiger Huang
f9e0eb0857 [automerger skipped] Update requested state after applying pending frames am: 23c75281ef -s ours am: 4ae3c0adba -s ours 
am skip reason: Change-Id Id8f3c1956fbfe3ad16f167ff76297dde6c634e81 with SHA-1 23c75281ef is in history

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

Change-Id: I89f929bd852cefd92f5006ce11f068681485ca48
 2020-08-19 16:12:14 +00:00
Chris Ye
3c5b809387 Add "uinput" command to support uinput device. 
Add support of uinput device with "uinput" shell command, allows user to
create a virtual uinput device and inject events to it, for input
framework testing.

Bug: 160360195
Bug: 163217897

Test: run uinput command from adb shell.
Change-Id: Ic885ae510d98fa282722f7a17d66778c15a893b6
 2020-08-19 09:12:11 -07:00
TreeHugger Robot
af90f3fe7e Merge "Correct the return value of applyAnimationLocked." into rvc-d1-dev 2020-08-19 16:10:26 +00:00
Tiger Huang
328d06eee4 [automerger skipped] Update requested state after applying pending frames am: 23c75281ef am: 02b0205641 -s ours 
am skip reason: Change-Id Id8f3c1956fbfe3ad16f167ff76297dde6c634e81 with SHA-1 1a53789bc8 is in history

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

Change-Id: I4f98944d81373a67c239837bc29ebe24b431989e
 2020-08-19 16:09:36 +00:00
TreeHugger Robot
dbc1b12948 Merge "Media - Ignore flaky test" 2020-08-19 16:03:16 +00:00
TreeHugger Robot
cac0df7343 Merge "Add battery discharge prediction APIs." 2020-08-19 15:59:22 +00:00
Tiger Huang
4ae3c0adba [automerger skipped] Update requested state after applying pending frames am: 23c75281ef -s ours 
am skip reason: Change-Id Id8f3c1956fbfe3ad16f167ff76297dde6c634e81 with SHA-1 1a53789bc8 is in history

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

Change-Id: I3eb1f93e5723298179e58f3dbee339fb0a923ace
 2020-08-19 15:58:15 +00:00
Tiger Huang
02b0205641 Update requested state after applying pending frames am: 23c75281ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12400337

Change-Id: I955a32723913c7cc238ce38e8c97328295dae27c
 2020-08-19 15:58:11 +00:00
Tyler Gunn
952a4a3ccb Merge "Add default constructor to NR cell classes" am: f12f3415d0 am: 503b23ed03 am: 8ef5d0eb2c am: 827314c594 am: 23382679eb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1202369

Change-Id: Ic3bfcb76af675f1e58140509453a1db1d56339a2
 2020-08-19 15:53:56 +00:00
Tyler Gunn
23382679eb Merge "Add default constructor to NR cell classes" am: f12f3415d0 am: 503b23ed03 am: 8ef5d0eb2c am: 827314c594 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1202369

Change-Id: I4617272446ffb32d5d33d14d825f4ed919cc1c47
 2020-08-19 15:41:33 +00:00
Vishnu Nair
cfd825ef5c Merge "Rename InputWindowHandle hasFocus to focusable" 2020-08-19 15:34:01 +00:00
Tyler Gunn
827314c594 Merge "Add default constructor to NR cell classes" am: f12f3415d0 am: 503b23ed03 am: 8ef5d0eb2c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1202369

Change-Id: I98d0a95c48f8fde725490d44403c0720c147f59d
 2020-08-19 15:30:23 +00:00
Makoto Onuki
51143b5d99 Merge "Change MIN_CRASH_INTERVAL to 2 minutes, also make customizable" 2020-08-19 15:23:06 +00:00
Tyler Gunn
8ef5d0eb2c Merge "Add default constructor to NR cell classes" am: f12f3415d0 am: 503b23ed03 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1202369

Change-Id: I87b1c44c4fc42d114bbe1bd25b2f3b2475d6c3e2
 2020-08-19 15:18:42 +00:00
Tyler Gunn
503b23ed03 Merge "Add default constructor to NR cell classes" am: f12f3415d0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1202369

Change-Id: Ife774cd4a160bd884ed4634d484fb7f9fbbedf32
 2020-08-19 15:08:26 +00:00
TreeHugger Robot
c597b65e96 Merge "Remove ResourcesManager Slog.wtf" 2020-08-19 15:00:40 +00:00
Tyler Gunn
f12f3415d0 Merge "Add default constructor to NR cell classes" 2020-08-19 14:54:39 +00:00
wilsonshih
48288a505d Correct the return value of applyAnimationLocked. 
The starting window cannot be removed because it is waiting for the
exiting animation finished, This may happen if the animation is not
applied when #selectAnimation cannot find an appropriate animation.
To make the state correct, the return result of #applyAnimationLocked
should not only reference to the hierarchial animation state.

Bug: 161847146
Test: atest WmTests
Change-Id: I69bcd29f2587a3644485a0db05e622f6775cc82f
Merged-In: I69bcd29f2587a3644485a0db05e622f6775cc82f
 2020-08-19 14:49:55 +00:00
Wei Sheng Shih
0911a75ea5 Merge "Correct the return value of applyAnimationLocked." 2020-08-19 14:48:25 +00:00
wilsonshih
ec4642a9b6 Correct the return value of applyAnimationLocked. 
The starting window cannot be removed because it is waiting for the
exiting animation finished, This may happen if the animation is not
applied when #selectAnimation cannot find an appropriate animation.
To make the state correct, the return result of #applyAnimationLocked
should not only reference to the hierarchial animation state.

Bug: 161847146
Test: atest WmTests
Change-Id: I69bcd29f2587a3644485a0db05e622f6775cc82f
 2020-08-19 14:46:24 +00:00
Govinda Wasserman
ecb4779fe0 Merge "Adds event for screenshot request from a vendor gesture" 2020-08-19 14:25:56 +00:00