Commit Graph

6512 Commits

Author SHA1 Message Date
Automerger Merge Worker
f92878e651 docs: Removing most of the intro to PowerManager API am: 3fea8d1042
Change-Id: I25c41e4998197ef1df2c95fb1f2360360970389f
2019-12-17 19:58:53 +00:00
Andrew Solovay
3fea8d1042 docs: Removing most of the intro to PowerManager API
The intro text says PowerManager is discouraged, and almost
all the available wakelock options have long been deprecated.
Given that, I think it makes sense to remove most of that
intro and just point devs to FLAG_KEEP_SCREEN_ON instead.

Staged to:
go/dac-stage/reference/android/os/PowerManager

Test: make ds-docs
Bug: 145699347
Change-Id: I517366903f3d9743166d7edaddc08471af0803d9
2019-12-16 22:05:12 +00:00
Automerger Merge Worker
9480139340 Merge "docs: Delete duplicate word." into qt-dev am: 54a4bdccc4
Change-Id: I8a2aa5bc892412471324f3ec5edfa2aa6d39d62c
2019-12-02 23:03:04 +00:00
Nick Cook
4ca501a6bf docs: Delete duplicate word.
Change-Id: I09fcceda7a7b0fd291c57a3005d4e027ecb99bcc
bug: 145259639
2019-11-27 22:03:43 +00:00
Kevin Hufnagle
f58949bd0e Merge "docs: Added perm req for getUserCount()" into qt-dev
am: c949db391d

Change-Id: Ib9f6f7561cc6dd365537cf169d45c2eb191f514a
2019-11-06 14:57:13 -08:00
Kevin Hufnagle
c949db391d Merge "docs: Added perm req for getUserCount()" into qt-dev 2019-11-06 22:44:46 +00:00
Kevin Hufnagle
5813a8c567 docs: Added perm req for getUserCount()
Test: make ds-docs -j32

Bug: 31091793

Change-Id: Ib1cae91795b0c054f2ae95af6376a8f01d839d9f
2019-11-01 18:09:14 +00:00
Kevin Hufnagle
7b02dd8342 Merge "docs: Updated SECURITY_PATCH field description" into qt-dev
am: 3c92f24adb

Change-Id: Ieb7549bb38439ad297bba0f5a4b64870919651a7
2019-10-08 12:00:20 -07:00
Kevin Hufnagle
d9c7b449fe docs: Updated SECURITY_PATCH field description
Test: make ds-docs -j32

Bug: 127625306
Change-Id: I052bb647ebb36ea3c9a788be592e7de9cd969e10
2019-09-20 00:59:33 +00:00
Varun Shah
6947f255e4 Merge "Use language tags to store Configuration's locale list." into qt-dev
am: 6dfa267f91

Change-Id: Ia7f30abab7396bc36eb2d69990129143601b028b
2019-09-10 23:29:10 -07:00
Varun Shah
5e67462971 Use language tags to store Configuration's locale list.
Instead of storing each Locale within a Configuration object's locale
list by its language, country, variant, and script to proto, store the
entire locale list by its language tags representation which accurately
describes each locale.

Bug: 140197723
Test: atest ConfigurationTest
Test: atest UsageStatsDatabaseTest
Test: manually with bad data
Merged-In: I53946ed4e31de0ffe9c84875c391a7dec6f5375a
Change-Id: Idaae690f79a5c680ad0059a52be62160d9dfb5e7
2019-09-10 19:53:57 +00:00
Colin Cross
18bf694f3c Merge "Revert "Use language tags to store Configuration's locale list."" into qt-dev
am: dd67a548b2

Change-Id: I0aaee5386c85bf33b292cfa9241c3a0c62dedd29
2019-09-10 12:29:07 -07:00
Varun Shah
68cdb74d91 Revert "Use language tags to store Configuration's locale list."
This reverts commit ff43f4e6a6.

Reason for revert: b/140813780

Change-Id: Id5988b9ec959ca9b294f6bd5caa30c8156238d0a
2019-09-10 18:30:47 +00:00
Varun Shah
ec466c0a8e Merge "Use language tags to store Configuration's locale list." into qt-dev
am: bdfd7d6adb

Change-Id: I2ed88e4ce5bd3a00cc9ea951815c17c57a6599a2
2019-09-10 10:10:25 -07:00
Varun Shah
ff43f4e6a6 Use language tags to store Configuration's locale list.
Instead of storing each Locale within a Configuration object's locale
list by its language, country, variant, and script to proto, store the
entire locale list by its language tags representation which accurately
describes each locale.

Bug: 140197723
Test: atest ConfigurationTest
Test: atest UsageStatsDatabaseTest
Test: manually with bad data
Change-Id: Id0e63ae4a7be578d1e93838b371320f86a787e0e
2019-09-09 22:41:54 +00:00
Kevin Hufnagle
40a40c73d7 Merge "docs: Improved tick/click effect descriptions" into qt-dev
am: a7496671da

Change-Id: Id33aa9b90e3a62751a9fa7a4074a44737d7a95e3
2019-08-29 18:52:02 -07:00
Kevin Hufnagle
86b17d2523 docs: Improved tick/click effect descriptions
Test: make ds-docs -j32

Bug: 139888074
Change-Id: I939aaa4cf81ddab1705611222c12a60823493d38
2019-08-29 19:30:42 +00:00
John Reck
1775a48935 Merge "Fix regression in PFD#fromData" into qt-r1-dev 2019-07-29 21:23:57 +00:00
bsears
868ac4f3a1 Merge "Revert "SharedMemory: break Cleaner reference cycle." Bug: 138422309" into qt-dev
am: d4b0c9348a

Change-Id: Icef464ff04de9d1e300161383251e35d557ca973
2019-07-26 16:35:31 -07:00
bsears
de6bfd230c Merge "Revert "SharedMemory: clear file descriptor when explicitly closed." Bug: 138422309" into qt-dev
am: 480f1db9bc

Change-Id: Ib346fb19a7be0635fe9e15d0fc6a307a614fb1c5
2019-07-26 16:31:52 -07:00
John Reck
12ea937f8f Fix regression in PFD#fromData
Don't rely on the GC to clean up FD resources when they can
just be cleaned up immediately. We know the MemoryFile isn't
going to be used any further, so just close it.

Bug: 138323667
Test: Repro steps in bug. Verified addresses FD leak in system_server from repeatedly opening & closing settings.
Change-Id: Ic82006c9cb48f580aaad942c4679e774186382c9
2019-07-26 23:19:05 +00:00
Adam Seaton
b16411f83a Revert "SharedMemory: break Cleaner reference cycle."
Bug: 138422309

This reverts commit 390d9e6a18.

Reason for revert: crashes documented in b/138422309

Change-Id: I235f727d0fe87c09f6f05dddcae7759bab64dfd8
2019-07-26 17:17:16 +00:00
Adam Seaton
5966196515 Revert "SharedMemory: clear file descriptor when explicitly closed."
Bug: 138422309

This reverts commit 20ab1e3427.

Reason for revert: crashes documented in b/138422309

Change-Id: Ic9e33fdb24bad2b30f0eb357d6752c1834df41d5
2019-07-26 17:17:03 +00:00
Josh Gao
036d594c69 Merge changes I8bdb4c74,I613a7d03 into qt-dev
am: a09ee2d39f

Change-Id: I6ae25d6b3aa39ef6f9ed1ffcf6fce6e5920a5578
2019-07-25 16:54:20 -07:00
Josh Gao
20ab1e3427 SharedMemory: clear file descriptor when explicitly closed.
We run the Cleaner in close, but after the fix in commit 6ca916a6, this
no longer clears the value stored in the FileDescriptor, which means
that subsequent operations on an explicitly closed SharedMemory will
operate on a bogus fd number. Clearing the FileDescriptor value in close
is sufficient, because Cleaner.clean is idempotent, and the only other
case where it executes is when the FileDescriptor is phantom reachable,
which means no one can access it to get its integer value.

Bug: http://b/138392115
Bug: http://b/138323667
Test: treehugger
Change-Id: I8bdb4c745466532a0712976416184c53fcf0dbf6
(cherry picked from commit a7641806dd)
2019-07-25 14:08:58 -07:00
Josh Gao
390d9e6a18 SharedMemory: break Cleaner reference cycle.
Previously, the Cleaner we create to close the ashmem file descriptor
used a thunk that held a strong reference to the FileDescriptor we
wanted to clean up, which prevented the Cleaner from ever running.

Break the cycle by storing the integer value of the file descriptor
instead.

Bug: http://b/138323667
Test: treehugger
Change-Id: I613a7d035892032f9567d59acb04672957c96011
(cherry picked from commit 6ca916a657)
2019-07-25 12:13:15 -07:00
Andrew Lewis
65ded6c655 Merge "Redact ISOBMFF boxes with 'free'" into qt-dev
am: f68a201ebc

Change-Id: I4755c6f884958dce01e06aa5a889f06e035f1f1c
2019-07-11 06:26:42 -07:00
Andrew Lewis
4ec5fda3d6 Redact ISOBMFF boxes with 'free'
Test: atest MediaStore_Video_MediaTest android.os.RedactingFileDescriptorTest
Bug: 135499138
Change-Id: Idaa8ad30300d5427f91bb2543be3152881018cf6
2019-07-10 19:46:48 +01:00
Mathew Inwood
68d07b7d6b Merge "Restore some greylist entries." into qt-dev
am: f76bdce6e0

Change-Id: I7636cbdbd4177461c56103a6a8e7d87498c9ba13
2019-06-28 08:19:19 -07:00
TreeHugger Robot
f76bdce6e0 Merge "Restore some greylist entries." into qt-dev 2019-06-28 12:02:43 +00:00
Mathew Inwood
3a75f264a8 Restore some greylist entries.
In Q, these APIs were either:
- removed from the greylist entirely without good reason
- Moved to the restricted greylist without any public alternative
  information added

So they are being moved back to the greylist for Q.

Test: Treehugger
Bug: 136102585
Change-Id: I5ac8b8b9b23c3789d80239cf456072cc7dfa1203
2019-06-28 10:15:37 +01:00
Tim Joines
4ecc6562f6 Merge "Disable USAP by default on devices" into qt-dev
am: 6c3bbf9e93

Change-Id: I131b75b45e43b185266ebb54f49815896fc67ffe
2019-06-27 09:22:21 -07:00
Tim Joines
6c3bbf9e93 Merge "Disable USAP by default on devices" into qt-dev 2019-06-27 16:01:43 +00:00
TreeHugger Robot
3af0a7b5e5 Merge "Ignore DND when FLAG_BYPASS_INTERRUPTION_POLICY is set." into qt-r1-dev 2019-06-25 19:49:32 +00:00
Tim Joines
341817e169 Disable USAP by default on devices
Test: manual, usap process missing on boot
Bug: 136003445
Change-Id: I991b24d2a386c0969bc27f9aecd6b8748b80085a
2019-06-25 09:21:45 -07:00
Michael Wright
7f378787dc Ignore DND when FLAG_BYPASS_INTERRUPTION_POLICY is set.
When DND is on, it sets AppOps to return MODE_IGNORED for any non-touch
vibrations. Unfortunately, this means it blocks critical vibrations as
well, like emergency alerts. In order to avoid this, we need to respect
FLAG_BYPASS_INTERRUPTION_POLICY when set on the vibration attributes.

Bug: 132112663
Bug: 135686242
Test: Manual
Change-Id: I59465eed057b077a4c0548af162e0fec1c29afdc
2019-06-25 16:57:10 +01:00
Daniel Rosenberg
db5894d5a9 Merge "Make RescueParty call vold directly" into qt-dev
am: 2618371aa5

Change-Id: Id4b104e811a30722ea3c70add3750a9319245ff5
2019-06-24 15:00:57 -07:00
Daniel Rosenberg
d078d8b15c Make RescueParty call vold directly
This changes RescueParty to call vold over binder directly for
Checkpointing related calls. It turns out that if the system is in a bad
enough state, the other method would not work, as some of the services
required would not be running.

Bug: 135558798
Test: setprop persist.sys.enable_rescue 1
      setprop debug.crash_system 1 or setprop debug.crash_sysui 1
      vdc checkpoint startCheckpoint 3
      stop
      start
      Device should go through the rescueparty flow, and reboot.
      Repeat without checkpoint. Device should prompt reboot.

Change-Id: I8b11d68075cc291e9557d524bc87b54d17b370e4
2019-06-24 13:23:27 -07:00
Yiwei Zhang
74cc59e57b Merge "Game Driver: Process sphal libraries in GraphicsEnvironment" into qt-dev
am: c0c88c6ed3

Change-Id: I8306fe050ef1be06b185b0a7a3183e0c5a9bdf75
2019-06-13 18:58:31 -07:00
TreeHugger Robot
c0c88c6ed3 Merge "Game Driver: Process sphal libraries in GraphicsEnvironment" into qt-dev 2019-06-14 01:36:32 +00:00
Yiwei Zhang
5229f699ee Merge "Game Driver: add support to apply prerelease driver for all apps" into qt-dev
am: 45315597ff

Change-Id: I31910c4b2360e1639cfd9017db66acac67e55347
2019-06-13 18:18:22 -07:00
Yiwei Zhang
e3490fce00 Game Driver: Process sphal libraries in GraphicsEnvironment
Previously, there's only one Game Driver existed in the system, so we process
sphal libraries in GPU service to save the launch time for loading Game Driver.
Now we need to support a separate prerelease driver, so we have to move the
processing back to app launch time.

Bug: 134881329
Test: Manual test with prerelease driver and Settings UI.
Change-Id: Ic1bb412a6a026c68f55243c906bd56fe1fee44c3
2019-06-13 14:40:56 -07:00
Yiwei Zhang
17704b8d1b Merge "Game Driver: Add support for prerelease channel" into qt-dev
am: ba3f191bd5

Change-Id: I73ec6c30adf0b084a3bbb191eaf66193b2151a47
2019-06-13 08:45:37 -07:00
Yiwei Zhang
ff9a4ee1c1 Game Driver: add support to apply prerelease driver for all apps
Bug: 134881329
Test: Manual test with prerelease driver and Settings UI.
Change-Id: I5f198b0845e9e6431066d44ef623f62e1f5c588a
2019-06-12 18:17:14 -07:00
Yiwei Zhang
5d0d4c6af2 Game Driver: Add support for prerelease channel
Bug: 134881329
Test: Manual test with prerelease driver.
Change-Id: I4865bbf0126df9c470aa7f1c163910eb58fb1a8b
2019-06-12 18:08:08 -07:00
Christian Wailes
2997615e73 Merge "Removes unused code from the SystemServer/Zygote classes." into qt-dev
am: 7983bfb3e6

Change-Id: If63d2cbe8b3ba2061276826f88496db8ea283510
2019-06-12 13:09:40 -07:00
Chris Wailes
bed1976f85 Removes unused code from the SystemServer/Zygote classes.
This patch partially reversts ag/6991475 and ag/7161709.  These changes
are no longer needed due to a change in the graphics driver strategy for
Q.

In addition, the preloading of the graphics driver in the USAPs need to
be removed to avoid causing a memory regression on devices with graphics
driver preloading in the Zygote disabled.

Bug: 134526352
Test: Treehugger
Change-Id: I570037866d1ae90794c711622e6045ebbffa5b9c
Merged-In: I570037866d1ae90794c711622e6045ebbffa5b9c
(cherry picked from commit fcd68fd74b)
2019-06-11 16:34:40 -07:00
Alexey Kuzmin
cd7cd3fd54 Merge "Link to death of external vibrations" into qt-dev
am: 192b61833d

Change-Id: I7e2a74de50ba7de660970f7588eca8030f75dfa8
2019-06-11 11:31:22 -07:00
Alexey Kuzmin
133815450b Link to death of external vibrations
Bug: 133200481
Test: manual
Change-Id: I6a76b926d60a79fd450a2f7eaf9609243ac0aaf7
2019-06-11 15:06:59 +01:00
Sudheer Shanka
7d231f164c Merge "Fix Environment.isExternalStorageLegacy() impl." into qt-dev
am: c703d04fbb

Change-Id: I6424adb818fb1d294e73540b54d37670d9ff50ee
2019-06-05 20:13:03 -07:00