Commit Graph

7158 Commits

Author SHA1 Message Date
Neil Fuller
882bc94f6f Merge "Remove dead code from SystemServer" am: 05eeef4188 am: 01d1dd28f1
am: 18e458ef00

Change-Id: Ibb828d6acea117032d9dbb1e6669c119768f5cf3
2019-11-25 10:40:53 -08:00
Charles Munger
ccce5e7915 Merge "Deprecate FileUtils.closeQuietly" am: e4b84f3475 am: 769cf05c56
am: 17fac19d82

Change-Id: Iccafa4d1eda9861d99f80f90652b87833387f571
2019-11-25 07:33:11 -08:00
Charles Munger
718b71bdca Merge "Deprecate Looper.prepareMainLooper" am: b1f69203e7 am: 8292d73554
am: d2db9aeebc

Change-Id: Id49e8ee1bcce156f6efe9da590eb1aac476f2726
2019-11-25 07:28:01 -08:00
Neil Fuller
18e458ef00 Merge "Remove dead code from SystemServer" am: 05eeef4188
am: 01d1dd28f1

Change-Id: Ifa10a6e2b48f596bfa6854e1a950cec060253c76
2019-11-25 06:28:07 -08:00
Neil Fuller
01d1dd28f1 Merge "Remove dead code from SystemServer"
am: 05eeef4188

Change-Id: I910fb0ac35c8de8fd500b3df0253c65b6b201fb4
2019-11-25 06:12:57 -08:00
Neil Fuller
05eeef4188 Merge "Remove dead code from SystemServer" 2019-11-25 13:53:15 +00:00
Charles Munger
17fac19d82 Merge "Deprecate FileUtils.closeQuietly" am: e4b84f3475
am: 769cf05c56

Change-Id: I1acede5beae3963825155e83eaa4381ea27c83c6
2019-11-22 16:08:57 -08:00
Charles Munger
769cf05c56 Merge "Deprecate FileUtils.closeQuietly"
am: e4b84f3475

Change-Id: Ia2f71d7cd97b32a175d0210a8f567ae75030439e
2019-11-22 16:03:14 -08:00
Treehugger Robot
e4b84f3475 Merge "Deprecate FileUtils.closeQuietly" 2019-11-22 23:52:41 +00:00
Charles Munger
d2db9aeebc Merge "Deprecate Looper.prepareMainLooper" am: b1f69203e7
am: 8292d73554

Change-Id: If6337140dff6edca87030b2d747ac1393f963957
2019-11-22 12:17:06 -08:00
Charles Munger
8292d73554 Merge "Deprecate Looper.prepareMainLooper"
am: b1f69203e7

Change-Id: If66e250dcaa558eef033abaed08b72642004aec6
2019-11-22 12:10:59 -08:00
Treehugger Robot
b1f69203e7 Merge "Deprecate Looper.prepareMainLooper" 2019-11-22 19:59:44 +00:00
Ytai Ben-tsvi
dd682aacaf Merge changes from topic "hidl-memory-java" am: 887aa66d0a
am: e74637df68

Change-Id: I475fdc72808a6d5767f09ac1f1796ef511696696
2019-11-22 10:16:39 -08:00
Ytai Ben-tsvi
e74637df68 Merge changes from topic "hidl-memory-java"
am: 887aa66d0a

Change-Id: If36ca2aad9c3e68e5a5be49e9e1566e44f40511b
2019-11-22 10:10:44 -08:00
Mohammad Samiul Islam
07b53113f1 Merge "Prevent staging multiple sessions on devices not supporting checkpoint" 2019-11-22 17:44:32 +00:00
Ytai Ben-tsvi
a99e006cd8 Merge changes from topic "hidl-memory-java"
* changes:
  Add HidlMemoryUtil
  Add parceling support for HIDL memory in Java
2019-11-22 00:33:34 +00:00
Ytai Ben-Tsvi
a736d1c1ee Add HidlMemoryUtil
Convenience utilities for working with HidlMemory.

Change-Id: I85a46d37de7b89fb48c57f69b1552ca59b802c19
Merged-In: I85a46d37de7b89fb48c57f69b1552ca59b802c19
Bug: 143566068
2019-11-21 15:28:09 -08:00
Ytai Ben-Tsvi
a907efc3bc Add parceling support for HIDL memory in Java
This change adds support for reading/writing a HidlMemory
instance into / out of a HwParcel and HwBlob, in a format that
is compatible with the hidl_memory C++ type.
This paves the way to be able to exchange shared memory blocks
between native and Java via HwBinder, which will be exposed
as adding Java support for the HIDL 'memory' type.

Change-Id: I6cbbf852218c8a631f9014e7caa7a97d17e11889
Bug: 143566068
Merged-In: I6cbbf852218c8a631f9014e7caa7a97d17e11889
2019-11-21 15:19:47 -08:00
Ytai Ben-Tsvi
335114af79 Add HidlMemoryUtil
Convenience utilities for working with HidlMemory.

Change-Id: I85a46d37de7b89fb48c57f69b1552ca59b802c19
Bug: 143566068
2019-11-21 13:39:12 -08:00
Ytai Ben-Tsvi
4659e18733 Add parceling support for HIDL memory in Java
This change adds support for reading/writing a HidlMemory
instance into / out of a HwParcel and HwBlob, in a format that
is compatible with the hidl_memory C++ type.
This paves the way to be able to exchange shared memory blocks
between native and Java via HwBinder, which will be exposed
as adding Java support for the HIDL 'memory' type.

Change-Id: I6cbbf852218c8a631f9014e7caa7a97d17e11889
Bug: 143566068
2019-11-21 13:38:39 -08:00
TreeHugger Robot
5d1c9a388a Merge "Exposing WorkSource hidden APIs as system APIs" 2019-11-21 21:15:48 +00:00
Neil Fuller
4b03c07cc7 Remove dead code from SystemServer
Remove dead code from SystemServer that obstensively protects devices
from negative (< 1970) system clock times, but does not.

In reality, SystemServer calls SystemClock.setCurrentTimeMillis(), which
calls through to the AlarmManager.setTime() binder call. When the code
runs the system server hasn't started any services yet, so this would
always fail.

AlarmManager has similar protections in place that do work: if the
device is earlier than a "build time", then the device's clock is forced
forward. That provides the protection that the code being removed from
SystemServer was trying to achieve.

Test: Added logging to SystemClock to prove AlarmManager is null /
manual debugging

Change-Id: I87dca1062829bc1a10202804fa7ee31e0a6f03a3
2019-11-21 17:30:03 +00:00
Mohammad Samiul Islam
cc4c7d8cc6 Prevent staging multiple sessions on devices not supporting checkpoint
Bug: 141843321
Test: atest StagedInstallTest#testFailStagingMultipleSessionsIfNoCheckPoint
Change-Id: I118ae628649e9bef82641ef18841205091e98a6a
2019-11-21 14:30:34 +00:00
TreeHugger Robot
2f6c5fe32f Merge changes from topic "broadcast_multiple_perm"
* changes:
  AndroidKeyStoreProvider: Add @throws documentation
  RemoteException: Add @throws documentation
  Context: Rename Context.sendBroadcastMultiplePermissions
2019-11-21 06:28:10 +00:00
Daniel Colascione
f9128861ec Merge changes from topic "property-handle" am: 54543bb423 am: 1077797c14
am: d5e5232632

Change-Id: I23a5fe95b271a50d60546231a9facf59440bb2dd
2019-11-20 21:02:31 -08:00
Daniel Colascione
d5e5232632 Merge changes from topic "property-handle" am: 54543bb423
am: 1077797c14

Change-Id: I7e47fe571f2be140a76437c30b44e74619840d32
2019-11-20 20:55:19 -08:00
Daniel Colascione
1077797c14 Merge changes from topic "property-handle"
am: 54543bb423

Change-Id: Id1ebdeca53c8705ce3cfab8db2e25cfebaa7f8a3
2019-11-20 20:47:44 -08:00
Daniel Colascione
54543bb423 Merge changes from topic "property-handle"
* changes:
  Add new SystemProperties.Handle interface
  Reimplement android.os.SystemProperties in terms of libc facilities
2019-11-21 04:38:03 +00:00
Roshan Pius
866e9111c5 RemoteException: Add @throws documentation
Bug: 144792553
Test: Compiles
Change-Id: I5a7464c2fe786b8398c5abdf43f62479de62b133
2019-11-20 14:47:51 -08:00
Suprabh Shukla
f7cffa7aaf Exposing WorkSource hidden APIs as system APIs
Users of these APIs are planning to move to apex.

Test: atest FrameworksCoreTests:android.os.WorkSourceTest
atest CtsOsTestCases:android.os.cts.WorkSourceTest

Bug: 143551137
Change-Id: I2e97a8b469254ea92e3ee21571ee8ae3cbb9abbe
2019-11-20 14:26:47 -08:00
TreeHugger Robot
d29bd9b524 Merge "More precise argument name in isGuestUser" 2019-11-20 22:17:36 +00:00
Charles Munger
1b6300cdf2 Merge "Deprecate implicit Handler constructors" am: 560c3ebe1e am: 080ddd5dfd
am: 952dd95b46

Change-Id: Ia2de7c065ec5b8941087cd5c02eb9589f72c27b8
2019-11-19 19:56:42 -08:00
Bookatz
07758e3970 More precise argument name in isGuestUser
The 'int id' refers to a userId.

Test: treehugger
Change-Id: I9f5aad8acdc82e078227c5b39ffb108084531dec
2019-11-19 17:16:08 -08:00
Charles Munger
952dd95b46 Merge "Deprecate implicit Handler constructors" am: 560c3ebe1e
am: 080ddd5dfd

Change-Id: I26b31ede3abd2e2f2eb9747139861179d7e8e669
2019-11-19 16:19:58 -08:00
Charles Munger
080ddd5dfd Merge "Deprecate implicit Handler constructors"
am: 560c3ebe1e

Change-Id: I254f85c07743883c7d350a47750dad0745c47d52
2019-11-19 16:04:15 -08:00
Treehugger Robot
560c3ebe1e Merge "Deprecate implicit Handler constructors" 2019-11-19 23:28:12 +00:00
Hall Liu
ae63546d19 Merge commit '1d7a53da981b7d4281c58af7eb9b150163b344a6' into manual_merge_1d7a53da981b7d4281c58af7eb9b150163b344a6
am: dab3711435

Change-Id: Ib75482a87545f7743f0049c8e51c354d2294c2af
2019-11-19 15:12:28 -08:00
Daniel Colascione
6e2cff7fa1 Add new SystemProperties.Handle interface
This new interface allows Java code to look up property values without
paying for the name->prop_info mapping and, in the case of looking up
scalars, without doing any allocation.

Bug: 140788621
Test: added tests
Test: atest FrameworksCoreSystemPropertiesTests
Change-Id: I46d12f62499e9e124fe9add588376d724b364d5d
2019-11-19 13:28:56 -08:00
Daniel Colascione
5e8ba5f05a Reimplement android.os.SystemProperties in terms of libc facilities
A subsequent CL will implement a new prop_info based properties API on
top of this CL.

Test: boots
Test: atest FrameworksCoreSystemPropertiesTests
Bug: 140788621
Change-Id: Id8dd02fff7b1c0815a27ab1dfdde1700447a414c
2019-11-19 13:27:53 -08:00
Hall Liu
dab3711435 Merge commit '1d7a53da981b7d4281c58af7eb9b150163b344a6' into manual_merge_1d7a53da981b7d4281c58af7eb9b150163b344a6
Change-Id: Ie08d8bb30e48a9e7ade85334c6195a791ecc0d9b
2019-11-19 12:37:24 -08:00
Artur Satayev
785d3a03b9 Merge "Add @UnsupportedAppUsage annotations for greylist." 2019-11-19 15:05:51 +00:00
Artur Satayev
751e55114c Add @UnsupportedAppUsage annotations for greylist.
go/cleanup-greylist-txt

These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.

This is partial merge of aosp/Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09. Telephony greylist cleanup has been done separately. Note that annotations outside of frameworks/base/ have been merged from AOSP.

Bug: 137350495
Test: m
Exempt-From-Owner-Approval: merge
Change-Id: I015c466e8b69cc0fed5e9d394ba865aad11d8ba6
2019-11-19 15:05:35 +00:00
Hall Liu
1d7a53da98 Merge changes from topic "mainline4"
* changes:
  Add new API for Telecom to send phone state
  Minor style correction to avoid merge conflict
  non-mainline telephony related AIDL refactor/decoupling
2019-11-18 22:31:27 +00:00
TreeHugger Robot
82865f85c1 Merge "Pipe featureId from app to noteOp for WallpaperMgr" 2019-11-18 19:01:35 +00:00
Jayachandran C
82e53b725a Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 337df70e17 am: 0a86ee3b3e
am: 78f84d5abe

Change-Id: I24e2c0c353f9e74a65c2e3d24a43338022b3efc4
2019-11-15 22:25:23 -08:00
Jayachandran C
78f84d5abe Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 337df70e17
am: 0a86ee3b3e

Change-Id: I2b1be68cd2eea8a4795a882933ed91dbf6ed83ee
2019-11-15 22:11:01 -08:00
Philip P. Moltmann
41ff0f6724 Pipe featureId from app to noteOp for WallpaperMgr
Test: atest CtsAppOpsTestCases(now includes canary test for this flow)
Bug: 136595429
Change-Id: I5f309646286cc4f3e080b87f482199fface67370
2019-11-15 20:09:13 -08:00
Jayachandran C
0a86ee3b3e Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs"
am: 337df70e17

Change-Id: Iba519e0e11af591d93f9bca5e09aab6191240b39
2019-11-15 19:11:44 -08:00
Chen Xu
8eb62f9485 non-mainline telephony related AIDL refactor/decoupling
1. decouple IOnSubscriptionChangedListener AIDL from telephonyMainline
2. other refactor. moving APIs which will not be included in
telephony mainline to frameworks/base/core/java/android/telephony.
Moving internal classes like AIDL which will not be included in
telephony mainline to
framework/base/core/java/com/android/internal/telephony

Bug: 140908357
Test: Build & unit test
Change-Id: I9413ef758cceadd251d03f3b5ea1054cc48ef044
Merged-In: I9413ef758cceadd251d03f3b5ea1054cc48ef044
2019-11-15 18:02:40 -08:00
Treehugger Robot
337df70e17 Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" 2019-11-16 01:36:08 +00:00