Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
551,882 Commits 3 Branches 0 Tags
a8333192aaa747e23efa6d779ef8eebf01e24ee0
Commit Graph

5978 Commits

Author SHA1 Message Date
Automerger Merge Worker
b58765d362 Merge "Merge "Store ETWS primary information in the database" into rvc-dev am: dc9e545bd1 am: 74f7d0ffda am: b493bbddb9" into rvc-qpr-dev-plus-aosp am: 800e6d0786 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11712801

Change-Id: I61636d6147c8448bfcbbc2e3debf505d6371d066
 2020-06-04 01:31:30 +00:00
Jack Yu
b493bbddb9 Merge "Store ETWS primary information in the database" into rvc-dev am: dc9e545bd1 am: 74f7d0ffda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11712801

Change-Id: Iddffa7a9d9245aef8ee7126dcb2e832b344a4652
 2020-06-04 01:03:49 +00:00
Jack Yu
dc9e545bd1 Merge "Store ETWS primary information in the database" into rvc-dev 2020-06-04 00:46:07 +00:00
Jack Yu
059be24240 Store ETWS primary information in the database 
ETWS primary/secondary flag needs to be saved in the
database in order to perform duplicate check later. Used the
hardcoded database column name because Android R API freezes.
Will remove the hardcode in the next Android release.

Fix: 157699377
Test: CtsTelephonyTestCases & CellBroadcastServiceTests
Change-Id: Iedec92a1f435f60ceb9f36637a1718adbbd7e2ae
 2020-06-03 21:18:54 +00:00
Julia Reynolds
6e9cd469f2 Merge "Update conversation priority onboarding" into rvc-dev am: ff182768f7 am: 85f4e8e85e am: 4a5aafccb8 am: 4ecd6d8f09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11707052

Change-Id: Ie2bc16abc2b854d76b2e01eb48c9b165e4a6f576
 2020-06-03 12:15:59 +00:00
Julia Reynolds
4a5aafccb8 Merge "Update conversation priority onboarding" into rvc-dev am: ff182768f7 am: 85f4e8e85e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11707052

Change-Id: I62090e9f5a24336940a5d9f8dbe9d99cfd341500
 2020-06-03 11:49:39 +00:00
Julia Reynolds
e03aa8f751 Update conversation priority onboarding 
And fix a bug with toggling priority I noticed while testing

Test: atest
Fixes: 157988478
Bug: 155490513
Change-Id: I8f5a6076ed2aa6c862a187bac15f3ad9af3cd141
 2020-06-02 16:49:39 -04:00
Zach Johnson
1eec532a8e Add NAMESPACE_BLUETOOTH for bluetooth feature experiments 
Exempt-From-Owner-Approval: exact cherry-pick from already approved master CL.
Test: compile
Bug: 156757711
Merged-In: I330b8cc5aeb14ebcc15fb88c605ac72770497040
Change-Id: I330b8cc5aeb14ebcc15fb88c605ac72770497040
(cherry picked from commit 9b9235981c)
 2020-05-27 02:01:21 +00:00
TreeHugger Robot
30d0ab9a23 Merge "Add NAMESPACE_BLUETOOTH for bluetooth feature experiments" 2020-05-26 22:56:03 +00:00
Automerger Merge Worker
b1efbe58d3 Merge "Merge "Add Setting for NR screen off indications" into rvc-dev am: 8300a64490 am: a7dfbb4186 am: d86daf1232" into rvc-qpr-dev-plus-aosp am: c15c1bb4e3 
Change-Id: I00bf6c1073948abac877af9a4290037dd63170be
 2020-05-26 22:43:47 +00:00
Sarah Chin
6118896275 Merge "Add Setting for NR screen off indications" into rvc-dev am: 8300a64490 am: a7dfbb4186 am: d86daf1232 
Change-Id: I849e8eb69da9d6f2e18e3e55e14a3f793fa9bda7
 2020-05-26 22:10:57 +00:00
Sarah Chin
8fde1df057 Merge "Add Setting for NR screen off indications" into rvc-dev am: 8300a64490 
Change-Id: Id94543e228ff6693045e102a74f728c7b22975da
 2020-05-26 22:02:50 +00:00
Sarah Chin
8300a64490 Merge "Add Setting for NR screen off indications" into rvc-dev 2020-05-26 21:56:42 +00:00
Zach Johnson
9b9235981c Add NAMESPACE_BLUETOOTH for bluetooth feature experiments 
Test: compile
Bug: 156757711
Change-Id: I330b8cc5aeb14ebcc15fb88c605ac72770497040
 2020-05-26 13:59:56 -07:00
Sarah Chin
6c28373913 Add Setting for NR screen off indications 
Test: build
Bug: 154241884
Change-Id: Ifa485230f6d27eaa7a665a396e3eac33e00feadb
 2020-05-14 15:45:16 -07:00
TreeHugger Robot
dbc435505e Merge "Change the timeout for integrity verification from 10 seconds to 30 seconds." into rvc-dev am: bc9515e4b9 am: 432ec22b4c am: 7a902cd2ab am: 225e9e1043 
Change-Id: Idd7b4cba8da170af718df4f46888f840c625cb79
 2020-05-13 23:18:40 +00:00
TreeHugger Robot
225e9e1043 Merge "Change the timeout for integrity verification from 10 seconds to 30 seconds." into rvc-dev am: bc9515e4b9 am: 432ec22b4c am: 7a902cd2ab 
Change-Id: Idde417a50f1c699087c424fed091ccfc033d4657
 2020-05-13 23:15:43 +00:00
TreeHugger Robot
fedb88559b Merge "Change the timeout for integrity verification from 10 seconds to 30 seconds." into rvc-dev am: bc9515e4b9 
Change-Id: Ia9efc035ed58eb08d8244ae1bfcb08ae1ab92718
 2020-05-13 22:43:36 +00:00
Song Pan
74b5e72f17 Change the timeout for integrity verification from 10 seconds to 30 seconds. 
Context: https://buganizer.corp.google.com/issues/154486093#comment24

Bug: 154486093
Test: N/A
Change-Id: I4fae3401ad7323acfa9cc520aac0cbb6bdbf6ada
 2020-05-13 20:27:40 +01:00
Inseob Kim
feaee354ed Merge "Remove sys.vdso property" into rvc-dev-plus-aosp am: a1c8f9b024 am: f053544154 am: 0df43165b6 
Change-Id: I0df8694cd3786d89763b761c8255c43d9d9d3e38
 2020-05-13 03:14:03 +00:00
Inseob Kim
dfafe03cb4 Remove sys.vdso property 
This is an experimental property on Q and doesn't need anymore.

Bug: 154885206
Test: N/A
Change-Id: Ibb09e17703fbc95fe41542d335311b68553502a0
 2020-05-11 22:19:38 +09:00
Kweku Adams
b4ac074fa1 Merge "Add master switch to enable/disable RESTRICTED bucket." into rvc-dev am: 86a71e6e93 am: 158d28f122 am: 3acd3c4066 am: 3bf51b99b4 
Change-Id: Idcfc67423dd57ded991eec43052e65ff093ffab2
 2020-05-08 16:02:55 +00:00
Kweku Adams
86a71e6e93 Merge "Add master switch to enable/disable RESTRICTED bucket." into rvc-dev 2020-05-08 15:01:03 +00:00
Kevin Chyn
874aefe9e9 Merge "Revert "Check Read permissions when getDocumentMetadata"" into pi-dev am: 3d599fd941 am: c1f5869518 am: 38691f7626 am: 73407d6559 am: a7cd89885f am: 280e561a86 am: 0fe956cfc1 
Change-Id: I640ab239ba72ef7a0df96c829938a8fb92ff6c6f
 2020-05-07 02:33:44 +00:00
Kevin Chyn
73407d6559 Merge "Revert "Check Read permissions when getDocumentMetadata"" into pi-dev am: 3d599fd941 am: c1f5869518 am: 38691f7626 
Change-Id: I2179cb6e443d25c859ab6c433b11aec63153f256
 2020-05-07 01:28:25 +00:00
Kevin Chyn
38691f7626 Merge "Revert "Check Read permissions when getDocumentMetadata"" into pi-dev am: 3d599fd941 am: c1f5869518 
Change-Id: I1ea9173d607acdcbd03de42aa793b018c23828e3
 2020-05-07 01:15:56 +00:00
Kevin Chyn
c1f5869518 Merge "Revert "Check Read permissions when getDocumentMetadata"" into pi-dev am: 3d599fd941 
Change-Id: I18eb6c4cd9c42f3cc1d1051b47aafeeffb6b0c16
 2020-05-07 01:02:48 +00:00
Kevin Chyn
f21b907b1b Revert "Check Read permissions when getDocumentMetadata" 
This reverts commit c94646177c.

Reason for revert: 155930637

Change-Id: Id452d316d1c1721fce715474df009ebe0fb719e8
 2020-05-07 00:39:46 +00:00
Diksha Gohlyan
3bea45c642 Merge "Check Read permissions when getDocumentMetadata" into pi-dev am: 4371baafc1 am: ada451e47c 
Change-Id: Id40f7456923144e3496df2028c771325ad1f480e
 2020-05-06 23:16:07 +00:00
Diksha Gohlyan
ada451e47c Merge "Check Read permissions when getDocumentMetadata" into pi-dev am: 4371baafc1 
Change-Id: Ib242d6ed7ff376a71f85a03aa06f2c0453638310
 2020-05-06 23:05:34 +00:00
Marco Ballesio
fc700be9ea Settings option to enable/disable the app freezer am: 74f0159425 am: 09c2b28707 am: aa60731a26 am: ac5a668cec 
Change-Id: Ibc503674080290df71e7169ca0e3d82d5e1958ee
 2020-05-06 17:28:05 +00:00
Marco Ballesio
09c2b28707 Settings option to enable/disable the app freezer am: 74f0159425 
Change-Id: I0cef9c5b771b6dcb4234a39ce5f7039a58c91798
 2020-05-06 16:50:29 +00:00
Marco Ballesio
ce9b47859d Merge changes from topic "developer option for app freezer" into rvc-dev 
* changes:
  Resources and strings for freezer settings
  Settings option to enable/disable the app freezer
  ActivityManager API to check availability of app freezer
 2020-05-06 16:35:44 +00:00
Kweku Adams
2d79ce5f50 Add master switch to enable/disable RESTRICTED bucket. 
Adding a master on/off switch for the new bucket such that when it's off,
apps aren't be put into the bucket and any apps already in it are brought
out.

Bug: 155670438
Test: atest FrameworksServicesTests:AppIdleHistoryTests
Test: atest FrameworksServicesTests:AppStandbyControllerTests
Test: atest SettingsProviderTest:SettingsBackupTest
Change-Id: Iaeabefa14cbaa2d07a13555ecbc29e6fbf11a29c
 2020-05-06 08:51:40 -07:00
Marco Ballesio
74f0159425 Settings option to enable/disable the app freezer 
The new setting option allows for a local configuration to override the
Device Config flag. Device Config and experiments will be honored by
default.

Bug: 155465196
Change-Id: I978a7b6bd75d9daab3fafed58b7f3c6417e0adab
Test: the option is correctly read and written by the companion CLs
 2020-05-05 15:22:56 -07:00
Diksha Gohlyan
c94646177c Check Read permissions when getDocumentMetadata 
Test: manually tested
Bug: 151095863

Change-Id: I4f04f08f76d039196c2c67bac80d4a46ebec87f2
(cherry picked from commit 0e75809955)
 2020-05-05 20:00:05 +00:00
Kevin Hufnagle
8847dfe1b9 Merge "docs: Clarify class definition of Settings.Secure" into rvc-dev am: a18b3ea71b am: a2894097ce am: 9bc754be17 am: 303993ba0f 
Change-Id: I888932e67ffc6592c5a3a68e2eeb7769424a3eac
 2020-05-04 17:34:57 +00:00
Kevin Hufnagle
a18b3ea71b Merge "docs: Clarify class definition of Settings.Secure" into rvc-dev 2020-05-04 17:03:25 +00:00
Lucas Dupin
de4431f84a Merge "Move media setting to a constant, disabling it" into rvc-dev am: 2d8266cdc4 am: 926a823c27 am: 8aa59d2de4 am: c05d812148 
Change-Id: Iec6b3a14976739f55b32da22da526b6b0ace6467
 2020-05-04 04:48:28 +00:00
Lucas Dupin
2d8266cdc4 Merge "Move media setting to a constant, disabling it" into rvc-dev 2020-05-04 03:59:28 +00:00
Andrew Sapperstein
8fe35e5f21 Fix broken @see tags in public documentation. 
These were previously being suppressed by doclava but with this change,
all failures are fixed and the suppression logic has been removed.

To fix the issues, there were a few possible changes made:
- broken reference to a public API (such as incorrect parameters): fixed
- unnecessary @link inside an @see tag: fixed
- @see referring to an @hide or @SystemApi: reference removed
- broken references to inner class constructors
 - worked around by fully qualifying the constructor

Bug: 6963924
Test: make doc-comment-check-docs
Exempt-From-Owner-Approval: cherry-picked from master
Change-Id: Ifbdce2de96cdffa560bd90f549fa7184d1f9af85
Merged-In: Ifbdce2de96cdffa560bd90f549fa7184d1f9af85
(cherry picked from commit e0624c7a40)
 2020-05-01 18:25:32 +00:00
Lucas Dupin
fbe9117ed9 Move media setting to a constant, disabling it 
Test: manual
Test: atest SettingsBackupTest
Bug: 155315021
Change-Id: I2f96b1df5e635f3362352ef929e09d7d1ff4be66
 2020-05-01 10:48:58 -07:00
Andrew Sapperstein
6b1e3188a3 Merge "Fix broken @see tags in public documentation." 2020-05-01 00:27:47 +00:00
Chris Li
851e8f969e Merge "Allow Overlay Display to take display flags" into rvc-dev am: 07fbb63884 am: 4eb1cc95db am: d50a2c92f6 am: ff781bb21c 
Change-Id: Ic37fdc56178e1ab5bf93ed5289dc4b10111bf699
 2020-04-30 08:34:30 +00:00
TreeHugger Robot
3475af8bca Merge "Use POWER_MENU_LOCKED_SHOW_CONTENT in wallet" into rvc-dev am: 2b49f81e7e am: 6fd18c094a am: d6cd810b72 am: 4d9f934d0f 
Change-Id: I0d62d549753be9f33e7014c6b24894fa05352a3c
 2020-04-29 19:22:09 +00:00
Chris Li
1ac23bbf92 Allow Overlay Display to take display flags 
Before, CTS test used WindowManager#shouldShowSystemDecors() to set show
system decorations after overlay display launched, which wouldn't enable
system decorations without relaunching. Now, we can set those flag
before display launch similar to what VirtualDisplayHelper does.

Bug: 153624902
Bug: 154158053
Test: atest CtsWindowManagerDeviceTestCases:MultiDisplayClientTests
Test: atest CtsWindowManagerDeviceTestCases:MultiDisplaySystemDecorationTests
Change-Id: I83c21a74c722a23ac77141305a08d9f67c5bbcf0
 2020-04-29 11:44:27 -07:00
TreeHugger Robot
2b49f81e7e Merge "Use POWER_MENU_LOCKED_SHOW_CONTENT in wallet" into rvc-dev 2020-04-29 18:08:23 +00:00
Julia Reynolds
ce03e7b4bc Merge "Remove unused development setting" into rvc-dev am: 74b8acae26 am: 2d19e31977 am: feb3d78ab5 am: 9e0a82a988 
Change-Id: I4b656b9aa3c8658a097a567748a42fc7c67dab20
 2020-04-29 16:25:50 +00:00
Julia Reynolds
ccd18a9d58 Remove unused development setting 
Test: make, atest
Bug: 151821676
Change-Id: I74c2b7ac17d99f150c1c185f4b69b3b2e72d2575
 2020-04-29 13:22:25 +00:00
Sean Pont
d3cfe6204e Use POWER_MENU_LOCKED_SHOW_CONTENT in wallet 
Use POWER_MENU_LOCKED_SHOW_CONTENT to control lock screen behavior for
the Quick Access Wallet.
Do not provide Intents that will fail to start an Activity.
Update comments.

Bug:155232731
Bug:155186709
Test: manual
Test: atest CtsQuickAccessWalletTestCases

Change-Id: I78e5355a69d666aee6dd122389edabed170f07b2
 2020-04-28 17:40:09 -07:00