OSDN Git Service

android-x86/frameworks-base.git
5 years agoAdd RequiresApi annotations to LocationProvider
Soonil Nagarkar [Mon, 15 Apr 2019 20:22:52 +0000 (13:22 -0700)]
Add RequiresApi annotations to LocationProvider

Ensures that lint tests can run properly from client code which uses
this library.

Bug: 130188099
Test: manual
Merged-In: I1d3c8e486c38633d73c405f2c6f9b350ef1e6946
(cherry picked from commit 44efeaef4da29e1d0a9add7b89151ff0f12ff148)
Change-Id: I1d3c8e486c38633d73c405f2c6f9b350ef1e6946

5 years agoUse filter_packages to unbunden metalava
Jiyong Park [Sun, 15 Sep 2019 11:19:02 +0000 (20:19 +0900)]
Use filter_packages to unbunden metalava

This change fixes a problem that entire framework source files are given
to metalava even when many of the source files are not for public. Using
the new property filter_packages, only source files that belongs to the
public packages are given to metalava.

This CL also changes the name of the filegroup 'framework-srcs' to
'framework-non-updatable-sources' to better describe its contents. In
addition, a build-time only library 'framework-all' is introduced. This
library produces a header jar for all framework sources for both
non-updatable and updatable parts. It is put to the classpath when
invoking metalava to give information on the hidden classes that were
filtered-out.

Bug: 140764681
Test: m
Change-Id: I6e16679109ac07820e35037754d4327442c014f2

5 years agoMerge "SoundPool: Do not sleep on stop for USAGE_GAME or on BUFFER_END"
Andy Hung [Fri, 13 Sep 2019 21:18:56 +0000 (21:18 +0000)]
Merge "SoundPool: Do not sleep on stop for USAGE_GAME or on BUFFER_END"

5 years agoMerge "Listeners of active emergency numbers"
Shuo Qian [Fri, 13 Sep 2019 19:50:16 +0000 (19:50 +0000)]
Merge "Listeners of active emergency numbers"

5 years agoMerge "WindowOrientationListener: Check if proposed rotation is in range"
Treehugger Robot [Fri, 13 Sep 2019 18:57:50 +0000 (18:57 +0000)]
Merge "WindowOrientationListener: Check if proposed rotation is in range"

5 years agoSoundPool: Do not sleep on stop for USAGE_GAME or on BUFFER_END
Andy Hung [Tue, 10 Sep 2019 21:49:46 +0000 (14:49 -0700)]
SoundPool: Do not sleep on stop for USAGE_GAME or on BUFFER_END

Test: SoundPoolApplication, SoundPoolOggTest, Games
Bug: 139787914
Bug: 139788416
Bug: 140579743
Bug: 140779732
Merged-In: I83b9b1d61b65dcc4a73d676e1f8be1e022c70302
Change-Id: I83b9b1d61b65dcc4a73d676e1f8be1e022c70302
(cherry picked from commit a527524356a9a6bc9597e4d06cee5c02cf936a68)

5 years agoMerge "Fix QuotaController constants."
Treehugger Robot [Fri, 13 Sep 2019 17:14:40 +0000 (17:14 +0000)]
Merge "Fix QuotaController constants."

5 years agoMerge "Add nullability anotations"
Tao Bao [Fri, 13 Sep 2019 17:04:12 +0000 (17:04 +0000)]
Merge "Add nullability anotations"

5 years agoMerge "Honor HDMI_CONTROL_ENABLED setting in AudioService"
Treehugger Robot [Fri, 13 Sep 2019 16:58:19 +0000 (16:58 +0000)]
Merge "Honor HDMI_CONTROL_ENABLED setting in AudioService"

5 years agoMerge "Check FIPS_mode() rather than explicitly calling BORINGSSL_self_test."
Tobias Thierer [Fri, 13 Sep 2019 16:56:06 +0000 (16:56 +0000)]
Merge "Check FIPS_mode() rather than explicitly calling BORINGSSL_self_test."

5 years agoListeners of active emergency numbers
Shuo Qian [Wed, 4 Sep 2019 23:21:10 +0000 (16:21 -0700)]
Listeners of active emergency numbers

1) Introduce a new signature-level system permission allowing system apps to listen the
 active emergency number, placed by calls or texts.

2) Add PhoneStateListener API surface to provide a mechanism to listen the
outgoing call emergency number or outgoing sms emergency number.

Bug: 135204580
Test: atest
Change-Id: I6e6bce6d4b97d492ca20302002911f9daa20767e
Merged-In: I6e6bce6d4b97d492ca20302002911f9daa20767e
(cherry picked from commit 7a1eb6d56b3fb37c746664887b6f754e8d09d715)

5 years agoFix QuotaController constants.
Kweku Adams [Fri, 13 Sep 2019 01:39:24 +0000 (18:39 -0700)]
Fix QuotaController constants.

1. QuotaController wasn't using the updated constants on system start.
It would only use the updated constants if they were changed after
system start.
2. Updating ACTIVE limits to more workable numbers.

Bug: 137166468
Test: atest com.android.server.job.controllers.QuotaControllerTest
Change-Id: I3e2848446b20f7258fac2d96566c96aea5715949

5 years agoHonor HDMI_CONTROL_ENABLED setting in AudioService
Madhava Srinivasan [Mon, 26 Aug 2019 20:15:31 +0000 (22:15 +0200)]
Honor HDMI_CONTROL_ENABLED setting in AudioService

This change updates how AudioService is updated of changes to Hdmi Cec
status (enable/disable) and availablity.

Bug: 138956107
Bug: 138373017
Test: Android TV STB: make; flashall;Volume -/+; HDMI control enable/disable.
Change-Id: Iaf83a45206be076858e13d113ba772ed5c59ef60
Merged-In: Iaf83a45206be076858e13d113ba772ed5c59ef60

5 years agoMerge "Remove android.permission.PermissionManager from blacklist"
Mathieu Chartier [Thu, 12 Sep 2019 18:20:14 +0000 (18:20 +0000)]
Merge "Remove android.permission.PermissionManager from blacklist"

5 years agoRemove android.permission.PermissionManager from blacklist
Mathieu Chartier [Thu, 12 Sep 2019 16:19:07 +0000 (09:19 -0700)]
Remove android.permission.PermissionManager from blacklist

This is getting pulled in from somewhere, removing to fix
PreloadCheck test.

Bug: 140912480
Test: atest PreloadCheck
Change-Id: I8eea07930732865cc72fea0e352a1704d1c26118

5 years agoAdd nullability anotations
Kyeongkab.Nam [Thu, 12 Sep 2019 02:33:39 +0000 (11:33 +0900)]
Add nullability anotations

Add missing nullability for applyPayload.

Test: manual
Change-Id: Iafce9091767bd7a31937b0be329ede6639239d73

5 years agoMerge "Revert "Revert "Remove a misleading "flush" function."""
Christian Wailes [Wed, 11 Sep 2019 18:23:50 +0000 (18:23 +0000)]
Merge "Revert "Revert "Remove a misleading "flush" function."""

5 years agoMerge changes from topic "protobuf-3.9.1"
Colin Cross [Wed, 11 Sep 2019 18:00:16 +0000 (18:00 +0000)]
Merge changes from topic "protobuf-3.9.1"

* changes:
  Convert statsd_test and statsd_benchmark to proto lite
  Adapt to google::protobuf::uint64 type change

5 years agoMerge "Track changes to CountryTimeZones API"
Neil Fuller [Wed, 11 Sep 2019 10:58:38 +0000 (10:58 +0000)]
Merge "Track changes to CountryTimeZones API"

5 years agoMerge "Add uhid group to system_server"
Treehugger Robot [Wed, 11 Sep 2019 09:31:23 +0000 (09:31 +0000)]
Merge "Add uhid group to system_server"

5 years agoMerge "Swisscom VVM free SMS shortcodes CH"
Sama Lin [Wed, 11 Sep 2019 07:06:26 +0000 (07:06 +0000)]
Merge "Swisscom VVM free SMS shortcodes CH"

5 years agoMerge "Remove libhwbinder/libhidltransport deps"
Treehugger Robot [Tue, 10 Sep 2019 23:36:54 +0000 (23:36 +0000)]
Merge "Remove libhwbinder/libhidltransport deps"

5 years agoMerge "FocusRequester: refactor handleFocusLoss"
Treehugger Robot [Tue, 10 Sep 2019 20:49:49 +0000 (20:49 +0000)]
Merge "FocusRequester: refactor handleFocusLoss"

5 years agoFocusRequester: refactor handleFocusLoss
Jean-Michel Trivi [Mon, 5 Aug 2019 16:24:30 +0000 (09:24 -0700)]
FocusRequester: refactor handleFocusLoss

Break out the checks to see if a focus loss is handled by the
framework in a separate method, and reorder the if statements
for code clarity.

Annotate PlayerFocusEnforcer methods for nullability, add
javadoc

Test: atest AudioFocusTest
Change-Id: I9aaab804c78a2e2627ddbd7b9bd41fdec47d2b57
Merged-In: I9aaab804c78a2e2627ddbd7b9bd41fdec47d2b57

5 years agoMerge "Re-enable testAppZygoteServices in pre-submit."
Treehugger Robot [Tue, 10 Sep 2019 18:48:31 +0000 (18:48 +0000)]
Merge "Re-enable testAppZygoteServices in pre-submit."

5 years agoMerge "Reconcile Zygote process name code with Q release."
Treehugger Robot [Tue, 10 Sep 2019 18:48:31 +0000 (18:48 +0000)]
Merge "Reconcile Zygote process name code with Q release."

5 years agoMerge changes If2b3b414,I1039748d,Ib3cd38f5
Treehugger Robot [Tue, 10 Sep 2019 17:39:16 +0000 (17:39 +0000)]
Merge changes If2b3b414,I1039748d,Ib3cd38f5

* changes:
  AudioService: fix disconnect/connect of A2DP device
  audioservice: re send BT_SCO parameter to HAL when audioserver restarts
  audioservice: fix hasMediaDynamicPolicy() for loopback and render policies

5 years agoMerge "Refactor SoundEffectsHelper for asynchronous loading"
Treehugger Robot [Tue, 10 Sep 2019 17:35:25 +0000 (17:35 +0000)]
Merge "Refactor SoundEffectsHelper for asynchronous loading"

5 years agoMerge "AudioService: factor out sound effects handling"
Treehugger Robot [Tue, 10 Sep 2019 17:29:46 +0000 (17:29 +0000)]
Merge "AudioService: factor out sound effects handling"

5 years agoMerge "Use sendVolumeKeyEvent API instead of sendKeyEvent API"
Jean-Michel Trivi [Tue, 10 Sep 2019 16:43:00 +0000 (16:43 +0000)]
Merge "Use sendVolumeKeyEvent API instead of sendKeyEvent API"

5 years agoMerge "Don't clear the output array if it failed to open the proc status file"
Christian Wailes [Tue, 10 Sep 2019 16:40:18 +0000 (16:40 +0000)]
Merge "Don't clear the output array if it failed to open the proc status file"

5 years agoAudioService: fix disconnect/connect of A2DP device
Jean-Michel Trivi [Mon, 24 Jun 2019 17:39:19 +0000 (10:39 -0700)]
AudioService: fix disconnect/connect of A2DP device

 Due to the expected BECOMING_NOISY behavior associated
with a device disconnection, the disconnection is handled
asynchronously after a fixed delay. This delay caused an
inversion of commands in the processing order of the
disconnection of a device closely followed by connection
of the same device.
 The fix consists in:
- overriding the equals() operator for BtDeviceConnectionInfo
 so messages for a given device in the message queue
 can be checked / removed.
- when AudioDeviceBroker receives a command for A2DP
 connection or disconnection, remove all upcoming connection
 and disconnection commands in the queue for this device
 (see postBluetoothA2dpDeviceConnectionStateSuppressNoisyIntent)
- remove AudioDeviceBroker.handleSetA2dpSinkConnectionState, which
 was only used in BtHelper.onA2dpProfileConnected() with
 a CONNECTED state, and have this method perform a regular device
 connection (just like when coming from AM->AS).
- in AudioDeviceInventory.onSetA2dpSinkConnectionState(), support
 receiving a connection event for an already connected device,
 to support codec changes.

This change also includes modifications to the classes involved
in the device connection to make them support mocking/spying
to reproduce the bug conditions (see AudioDeviceBrokerTest).

Bug: 134932649
Test: atest AudioDeviceBrokerTest
Change-Id: If2b3b41409c77467a181a2f9b42310db9b9de8c5
Merged-In: If2b3b41409c77467a181a2f9b42310db9b9de8c5

5 years agoaudioservice: re send BT_SCO parameter to HAL when audioserver restarts
Eric Laurent [Sat, 13 Jul 2019 01:19:27 +0000 (18:19 -0700)]
audioservice: re send BT_SCO parameter to HAL when audioserver restarts

Fix omission in AudioDeviceBroker.onAudioServerDied() where parameter
"BT_SCO=on|off" must be send to HAL according to current forced usage
for communication.

Bug: 135512789
Test: killaudio server during call over BT SCO
Change-Id: I1039748db5591321869f70c3dc589fbc62d41c31
Merged-In: I1039748db5591321869f70c3dc589fbc62d41c31

5 years agoaudioservice: fix hasMediaDynamicPolicy() for loopback and render policies
Eric Laurent [Fri, 12 Jul 2019 17:31:51 +0000 (10:31 -0700)]
audioservice: fix hasMediaDynamicPolicy() for loopback and render policies

Exclude mixes with LOOPBACK + RENDER flags when looking for dynamic
policies matching media usage. As this is only used in the context
of sending becoming noisy intent we want to send the intent when playback
capture is active.

Bug: 137055231
Test: enable live caption and disconnect headset while music is playing
Change-Id: Ib3cd38f58c2ff78a2f2f13c5c22b637f9701e345
Merged-In: Ib3cd38f58c2ff78a2f2f13c5c22b637f9701e345

5 years agoRefactor SoundEffectsHelper for asynchronous loading
Mikhail Naganov [Tue, 2 Jul 2019 21:35:42 +0000 (14:35 -0700)]
Refactor SoundEffectsHelper for asynchronous loading

Use a dedicated thread for all SoundPool and MediaPlayer
operations. This ensures that the client (AudioService) doesn't
get blocked or delayed. This also removes the need to use
locking as all access to data happens on the same thread.

Simplify the implementation of the mapping between UI effect IDs
and SoundPool sample IDs.

Add event logging for sound effects loading.

Bug: 135763139
Test: normal scenario
      media volume responsiveness with stuck SoundPool
      behavior when declared sound assets are missing
Change-Id: Ie5a1684a2cabe05ff53270ad97cab161a87a59f9
Merged-In: Ie5a1684a2cabe05ff53270ad97cab161a87a59f9

5 years agoAudioService: factor out sound effects handling
Mikhail Naganov [Tue, 2 Jul 2019 18:44:35 +0000 (11:44 -0700)]
AudioService: factor out sound effects handling

Move the code related to sound effects loading and playback
into a separate class SoundEffectsHelper.

Bug: 135763139
Test: make and run phone
Change-Id: I30a7d897d740b02943c68924074f14fae3c3eff8
Merged-In: I30a7d897d740b02943c68924074f14fae3c3eff8

5 years agoUse sendVolumeKeyEvent API instead of sendKeyEvent API
Amy [Thu, 13 Jun 2019 22:06:15 +0000 (15:06 -0700)]
Use sendVolumeKeyEvent API instead of sendKeyEvent API

sendKeyEvent API always forwards the key control to the TV.
But for volume keys, we want it to be forwarded to the audio system if
system audio mode is on and if we are not a audio system itself.
sendVolumeKeyEvent can handle this logic.

Test: manual
Bug: 129116245
Change-Id: I6b81072ab49c092fac65cd542c19e611fc939cea
Merged-In: I6b81072ab49c092fac65cd542c19e611fc939cea
(cherry picked from commit ada40f59b63fe613448278a7cfbb7055146f8ccd)

5 years agoMerge "Rename profileSystemServer to shouldProfileSystemServer"
Mathieu Chartier [Tue, 10 Sep 2019 15:34:18 +0000 (15:34 +0000)]
Merge "Rename profileSystemServer to shouldProfileSystemServer"

5 years agoMerge "AudioService: Add the AudioDeviceBroker's message queue to the dump"
Jean-Michel Trivi [Tue, 10 Sep 2019 15:20:52 +0000 (15:20 +0000)]
Merge "AudioService: Add the AudioDeviceBroker's message queue to the dump"

5 years agoWindowOrientationListener: Check if proposed rotation is in range
Luca Stefani [Sat, 5 Jan 2019 15:40:12 +0000 (16:40 +0100)]
WindowOrientationListener: Check if proposed rotation is in range

* Some OEMs *coughs OnePlus* decided it was a great idea to add a fourth kind of rotation ( flat )

Change-Id: I54c6e6360e897fbc8445edabbf411807521c624b

5 years agoTrack changes to CountryTimeZones API
Neil Fuller [Tue, 10 Sep 2019 08:52:45 +0000 (09:52 +0100)]
Track changes to CountryTimeZones API

Track changes to CountryTimeZones.lookupByOffsetWithBias()
API: the method now takes an extra argument: dstOffsetMillis,
which is unused in this case.

This commit also improves the parameter names to be more descriptive.

Bug: 139091367
Test: treehugger
Change-Id: I2090965640bb389ea41bde460f380f9ea8a6b176

5 years agoMerge "Simplify APIs exposed for time zone lookups"
Neil Fuller [Tue, 10 Sep 2019 10:49:27 +0000 (10:49 +0000)]
Merge "Simplify APIs exposed for time zone lookups"

5 years agoSimplify APIs exposed for time zone lookups
Neil Fuller [Mon, 19 Aug 2019 19:39:30 +0000 (20:39 +0100)]
Simplify APIs exposed for time zone lookups

The libcore.timezone APIs may form the basis for some
new SystemApis. Before starting that process the API
surface is being rationalized to establish the core
use cases.

Test: Treehugger
Bug: 139091367
Change-Id: I6c8b791524d16223c414612913b22f4d70c27d61
Merged-In: I6c8b791524d16223c414612913b22f4d70c27d61
(cherry picked from commit 400efa36ef8666ad8341c36679a4f2cb9fd00f9f)

5 years agoMerge "Revert "Fix: vendor public libraries are accessible via System.loadLibrary""
Treehugger Robot [Tue, 10 Sep 2019 05:50:56 +0000 (05:50 +0000)]
Merge "Revert "Fix: vendor public libraries are accessible via System.loadLibrary""

5 years agoSwisscom VVM free SMS shortcodes CH
samalin [Tue, 10 Sep 2019 04:57:49 +0000 (12:57 +0800)]
Swisscom VVM free SMS shortcodes CH

Visual Voicemail uses SMS for provision, these SMSs are free to the
user. To add the shortcode 30047 into whitelist to avoid the premium
SMS notification appear.

Bug: 133877441
Test: manual test
Change-Id: I2f7da544c2a948d1528781ebd11b75f027779e0d

5 years agoRevert "Fix: vendor public libraries are accessible via System.loadLibrary"
Jiyong Park [Wed, 28 Aug 2019 14:19:20 +0000 (23:19 +0900)]
Revert "Fix: vendor public libraries are accessible via System.loadLibrary"

This reverts commit cfe38cdb1cc45c8b7dcbe4f39329551f6602b9ce.

The CL 8f712189dfc02285573337e2b4ab17678011db14 in libcore project avoids
the need for adding the new paths in LoadedApk. With the CL, a classloader
does not give up even when loader.findLibrary() has failed due to some
paths are not added to it. Instead, the classloader converts the given
libname into a filename (e.g. foo -> libfoo.so) then calls dlopen()
with the filename. The classloader reports failure only when the dlopen()
call has failed. Therefore, manually adding these paths to the classloader
is no longer needed and thus removed.

Bug: 109720125
Test: System.loadLibrary("adsprpc") is successful in Pixel (because
libadsprpc.so is in Pixel's vendor public lib list)
Test: atest cts/tests/tests/jni

Merged-In: I1970eba7e732728699042a36b89571915ec81451
(cherry picked from commit 37131e1ee61dd83121ef02744855ee514f0aa6c5)
Change-Id: I1970eba7e732728699042a36b89571915ec81451

5 years agoAudioService: Add the AudioDeviceBroker's message queue to the dump
Mikhail Naganov [Tue, 10 Sep 2019 00:47:31 +0000 (17:47 -0700)]
AudioService: Add the AudioDeviceBroker's message queue to the dump

Clogged queue means device-related requests will not be served.

Example dump snippet:

AudioDeviceBroker:
  Message handler (watch for unhandled messages):
    Handler (com.android.server.audio.AudioDeviceBroker$BrokerHandler) {753fed2} @ 359741
      Looper (AudioDeviceBroker, tid 115) {ed3aba3}
        (Total messages: 0, polling=true, quitting=false)

Bug: 135763139
Test: adb shell dumpsys audio
Change-Id: If2130a4bd8bd9536df01656fe1a8f94548912ab9
Merged-In: If2130a4bd8bd9536df01656fe1a8f94548912ab9

5 years agoMerge "AudioService: Add the service's message queue to the dump"
Treehugger Robot [Tue, 10 Sep 2019 00:05:26 +0000 (00:05 +0000)]
Merge "AudioService: Add the service's message queue to the dump"

5 years agoMerge "audioservice: do not show volume panel when system audio is on"
Treehugger Robot [Tue, 10 Sep 2019 00:03:18 +0000 (00:03 +0000)]
Merge "audioservice: do not show volume panel when system audio is on"

5 years agoAudioService: Add the service's message queue to the dump
Mikhail Naganov [Wed, 26 Jun 2019 23:56:03 +0000 (16:56 -0700)]
AudioService: Add the service's message queue to the dump

Clogged queue means UI and other commands can not reach
the service and will cause volume controls to malfunction.

Example dump snippet:

Message handler (watch for unhandled messages):
  Handler (com.android.server.audio.AudioService$AudioHandler) {a904698} @ 61825
    Looper (AudioService, tid 118) {6808ef1}
      Message 0: { when=-52s689ms what=25 ... }
      Message 1: { when=-52s8ms what=8 ... }
      Message 2: { when=-52s4ms what=8 ... }
      ...
      Message 35: { when=-2s436ms what=0 ... }
      (Total messages: 36, polling=false, quitting=false)

This indicates that the command queue is not being processed
because the handler got stuck. Checking stacks of the system_server
can help in figuring out the reason.

Bug: 135763139
Test: adb shell dumpsys audio
Change-Id: I02009720668af218edb38d5a5948a5964b72c685
Merged-In: I02009720668af218edb38d5a5948a5964b72c685

5 years agoRename profileSystemServer to shouldProfileSystemServer
Mathieu Chartier [Mon, 9 Sep 2019 20:05:31 +0000 (13:05 -0700)]
Rename profileSystemServer to shouldProfileSystemServer

Makes it clearer and addresses previous CR comment.

Bug: 139883463
Test: make
Change-Id: I7c1a1d99cf307b89ee8f2c5c906168d196b35d0e

5 years agoMerge "Add phenotype property for profiling system server"
Mathieu Chartier [Mon, 9 Sep 2019 19:47:55 +0000 (19:47 +0000)]
Merge "Add phenotype property for profiling system server"

5 years agoaudioservice: do not show volume panel when system audio is on
Eric Laurent [Tue, 11 Jun 2019 17:19:38 +0000 (10:19 -0700)]
audioservice: do not show volume panel when system audio is on

Do not show volume panel on TVs when system audio mode is ON.

Bug: 130524216
Test: make
Change-Id: Id8730455ee79f0ea3fa4c23e0a8b6bd2791eb2d3
Merged-In: Id8730455ee79f0ea3fa4c23e0a8b6bd2791eb2d3
(cherry picked from commit db961d82edee13b7f2a1e83f451c4f20430f8fce)

5 years agoMerge "Fix regression in PFD#fromData"
Treehugger Robot [Mon, 9 Sep 2019 19:21:04 +0000 (19:21 +0000)]
Merge "Fix regression in PFD#fromData"

5 years agoMerge "Add TelephonyManager APIs to take physical slotIndex - getSimCardState - getSi...
Treehugger Robot [Mon, 9 Sep 2019 17:58:52 +0000 (17:58 +0000)]
Merge "Add TelephonyManager APIs to take physical slotIndex - getSimCardState - getSimApplicationState"

5 years agoRemove libhwbinder/libhidltransport deps
Steven Moreland [Fri, 6 Sep 2019 19:09:14 +0000 (12:09 -0700)]
Remove libhwbinder/libhidltransport deps

Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I136e4d4459bb8c3c5abf3c0758dd5ae14d0ad2a2

5 years agoAdd phenotype property for profiling system server
Mathieu Chartier [Mon, 19 Aug 2019 20:08:14 +0000 (13:08 -0700)]
Add phenotype property for profiling system server

Added the property profilesystemserver in the RUNTIME_NATIVE_BOOT
namespace. This property is overrides the system one if it is
present.

Bug: 139883463
Test: set the property manually and verify that system server is started
Test: with profiling

(cherry picked from commit 7b31c74ddb844e2f0af79be6c87b9fd02a627987)

Merged-In: Ifd69530e52a717a381b3f91b15a74329614906f2
Change-Id: I00594949b845a75152c7ab3c94aa84a55b072776

5 years agoReconcile Zygote process name code with Q release.
Martijn Coenen [Fri, 6 Sep 2019 09:52:40 +0000 (11:52 +0200)]
Reconcile Zygote process name code with Q release.

Some Zygote code that was pushed to AOSP master is different from the
pushed Q release. In particular, a call to set the process name for a
Zygote child was missing, causing an app zygote test to fail.

Bug: 139535125
Test: atest android.app.cts.ServiceTest#testAppZygoteServices
Change-Id: I53b0bc0116f1573cb1e52a998e10346bd5601f67
Merged-In: I2bce277ff8f2de4614e19d5385fe6712b076f9c9

5 years agoRe-enable testAppZygoteServices in pre-submit.
Ian Kasprzak [Fri, 6 Sep 2019 19:13:56 +0000 (12:13 -0700)]
Re-enable testAppZygoteServices in pre-submit.

Code that caused it to fail was fixed.

Bug: 139535125
Test: atest android.app.cts.ServiceTest#testAppZygoteServices

Change-Id: I5f8eed38d4a8a56e750a6bb7fa7d397d9cd4c13d
Merged-In: I2bce277ff8f2de4614e19d5385fe6712b076f9c9
Exempt-From-Owner-Approval: Re-enabling fixed TEST_MAPPING tests
for AOSP after Q push.

5 years agoMerge "Crash app on foreground service notification error."
Treehugger Robot [Sat, 7 Sep 2019 04:47:45 +0000 (04:47 +0000)]
Merge "Crash app on foreground service notification error."

5 years agoAdd TelephonyManager APIs to take physical slotIndex
Patrick Huang [Tue, 27 Aug 2019 03:45:10 +0000 (20:45 -0700)]
Add TelephonyManager APIs to take physical slotIndex
- getSimCardState
- getSimApplicationState

Bug: 134627366
Test: Manual test on device
Change-Id: I72612afb9f8ff3d898db99afaaee0c0d3654f754
Merged-In: I72612afb9f8ff3d898db99afaaee0c0d3654f754

5 years agoDon't clear the output array if it failed to open the proc status file
qiwang [Thu, 22 Aug 2019 03:25:30 +0000 (11:25 +0800)]
Don't clear the output array if it failed to open the proc status file

According to the original documentation, the functions in Process.java
should return -1 when the process doesn't exist,this should be detected
by Process.readProcLine() when it fails to open the /proc/<pid>/status
file. Unfortunately readProcLine() zeroes-out the output array before
attempting to open the file, so the expected return value -1 is changed
to be 0  when the process doesn't exist. It's inconsistent with the
interface description definition, so correct it.

Test: try to use Process.getUidForPid(int pid) api to read a non-existent
process pid's uid, it will return -1 instead of 0.

Merged-In: Ic2ac7defea8b15dd65f907d04e168a1283a4f621
Change-Id: Ic2ac7defea8b15dd65f907d04e168a1283a4f621
Signed-off-by: qiwang <wangqi_a@xiaomi.com>
5 years agoConvert statsd_test and statsd_benchmark to proto lite
Colin Cross [Sat, 27 Oct 2018 06:28:02 +0000 (23:28 -0700)]
Convert statsd_test and statsd_benchmark to proto lite

libplatformprotos for the device is compiled using proto lite, and
statsd_test and statsd_benchmark have protos that reference the
libplatformprotos.  With protobuf 3.9.1 compiling a full proto
against a lite proto doesn't work.  Convert them to lite.  Requires
adding the protobuf internal protos to the sources,
libprotobuf-cpp-lite does not contain the compiled version of
field_options.proto.

Bug: 117607748
Test: m checkbuild
Change-Id: I0b101555ff604df17b2e3e06f3b3ce25adb1c9fb
Merged-In: I0b101555ff604df17b2e3e06f3b3ce25adb1c9fb

5 years agoAdapt to google::protobuf::uint64 type change
Colin Cross [Fri, 26 Oct 2018 20:04:41 +0000 (13:04 -0700)]
Adapt to google::protobuf::uint64 type change

Protobuf 3.9.1 redefines google::protobuf::uint64 from unsigned long
long to uint64_t, which is sometimes unsigned long and sometimes
unsigned long long.  Use PRIu64 to print it, and add an implementation
of ProtoOutputStream::write for long.

Bug: 117607748
Test: m checkbuild
Change-Id: Ib2d3f4e17857f8ccbbe342ce6678e76b591df510
Merged-In: Ib2d3f4e17857f8ccbbe342ce6678e76b591df510

5 years agoMerge "[view compiler] Add test coverage for layouts compiled from APK"
Treehugger Robot [Fri, 6 Sep 2019 20:40:22 +0000 (20:40 +0000)]
Merge "[view compiler] Add test coverage for layouts compiled from APK"

5 years agoMerge "Re-deprecating Capabilities in ImsFeature"
Brad Ebinger [Fri, 6 Sep 2019 18:55:17 +0000 (18:55 +0000)]
Merge "Re-deprecating Capabilities in ImsFeature"

5 years agoMerge "Support maximum wait time for Cell broadcast"
Pengquan Meng [Fri, 6 Sep 2019 17:15:28 +0000 (17:15 +0000)]
Merge "Support maximum wait time for Cell broadcast"

5 years agoCrash app on foreground service notification error.
Da Xing [Sun, 18 Nov 2018 12:10:17 +0000 (20:10 +0800)]
Crash app on foreground service notification error.

Resolved issue 118612296.

On any notification error, the NMS silently cancels the notification,
including foreground service notifications. Thus, an app could pass in a
garbage notification deliberately and start a foreground service silently.

This patch resolved this issue by judging the notification's flag, and if
it is a foreground notification, still crash the app as previous platforms,
and if it is a normal notification, don't crash the app.

Background: In 3ad4cdd1, which was merged into Android 9 release, the crash
behaviour is removed. But it is an important rule that foreground services
guaranteed to show an ongoing notification.

Test: Run the sample apk provided in the issue, it's main thread received
 a RemoteServiceException: Bad notification posted from package...
as intended behaviour.

Bug: 118612296
Merged-In: I94d9de50bb03c33666471e3dbd9c721e9278f7cb
Change-Id: Ice6faab055e2dacd3d2d12803fcf51e13d3b0f21

5 years agoSupport maximum wait time for Cell broadcast
Pengquan Meng [Tue, 27 Aug 2019 18:20:17 +0000 (11:20 -0700)]
Support maximum wait time for Cell broadcast

Geo-Fencing Maximum Wait Time a device shall allow to determines it
location meeting operator policy. If the device is unable to determine
its position meeting operator policy within the GeoFencing Maximum Wait Time,
it shall present the alert to the user and discontinue further positioning
determination for the alert.

Bug: 139022202
Test: manual
Merged-In: If3d8d7915f2d86da20c63e99bee01f30e3ea89c0
Change-Id: If3d8d7915f2d86da20c63e99bee01f30e3ea89c0
(cherry picked from commit 02d6ac0f2075f6da81f6d8d08d76818dc6e436bc)

5 years ago[view compiler] Add test coverage for layouts compiled from APK
Eric Holk [Fri, 2 Aug 2019 21:50:08 +0000 (14:50 -0700)]
[view compiler] Add test coverage for layouts compiled from APK

The existing LayoutCompilerTest only covered compiled layouts generated from
text XML files. It did not cover layouts that were extracted from the APK. This
is an important area to cover.

This test works by calling `pm compile --compile-layouts` on the test APK, and
then directly loads the `compiled_view.dex` file. From there, it pulls out the
compiled layouts and executes their inflater. This makes sure the generated DEX
files validate and execute without error.

Bug: 111895153
Merged-In: Ifc6719c2f438474b5474def02422ef68eee800b2
Change-Id: I7024069bb4d77a81871366f259fb34ae54a55aac

5 years agoRe-deprecating Capabilities in ImsFeature
Brad Ebinger [Thu, 5 Sep 2019 18:10:01 +0000 (11:10 -0700)]
Re-deprecating Capabilities in ImsFeature

Readding the @deprecated javadoc to Capabilities as it is valid
to @hide a superclass of a @SystemApi.

Bug: 138990145
Test: manual
Change-Id: I1749aa3f09b7782fd0d665238be4c288a33536ea

5 years agoMerge "DO NOT MERGE - Merge Android 10 into master"
Xin Li [Thu, 5 Sep 2019 16:53:23 +0000 (16:53 +0000)]
Merge "DO NOT MERGE - Merge Android 10 into master"

5 years agoMerge "Fix flaky test - testPartialConnectivity"
Lucas Lin [Thu, 5 Sep 2019 11:40:01 +0000 (11:40 +0000)]
Merge "Fix flaky test - testPartialConnectivity"

5 years agoFix flaky test - testPartialConnectivity
lucaslin [Wed, 4 Sep 2019 10:14:22 +0000 (18:14 +0800)]
Fix flaky test - testPartialConnectivity

This timing issue is happened when test case already verified
NetworkMonitor#setAcceptPartialConnectivity() before
NetworkAgent send the CONNECTED state to ConnectivityService.
This test case expects that the
NetworkMonitor#setAcceptPartialConnectivity() will be invoked
when network state is CONNECTED in
ConnectivityService#updateNetworkInfo().

NetworkAgent communicates with ConnectivityService by
AsyncChannel. Before they connect to each other, the thread of
NetworkAgent is keeping idle, so waitForIdle cannot handle this
kind of case. Although they have connected to each other, but
they don't communicate with each other, waitForIdle() still
cannot handle this case. It means waitForIdle() can only handle
the case that NetworkAgent already connected to
ConnectivityService and NetworkAgent is communicating with
ConnectivityService. So, that's why waitForIdle() sometimes
doesn't work in this case, and the most simplest and right way
to fix this case is to wait the available callback then verify
the method.

Bug: 140306320
Test: atest FrameworksNetTests: \
      ConnectivityServiceTest#testPartialConnectivity \
      --generate-new-metrics 500

Change-Id: I64bfecbfe3c5776bd5c347a821f9127e79539c48

5 years agoMerge "Add NetIdManagerTest"
Treehugger Robot [Thu, 5 Sep 2019 06:39:43 +0000 (06:39 +0000)]
Merge "Add NetIdManagerTest"

5 years agoMerge "Add ConnectivityServiceIntegrationTest"
Treehugger Robot [Thu, 5 Sep 2019 05:26:34 +0000 (05:26 +0000)]
Merge "Add ConnectivityServiceIntegrationTest"

5 years agoRevert "Revert "Remove a misleading "flush" function.""
Christian Wailes [Wed, 4 Sep 2019 23:35:54 +0000 (23:35 +0000)]
Revert "Revert "Remove a misleading "flush" function.""

This reverts commit 47da17740520f3d6ba952c65593f8660b89b8abf.

Reason for revert: Fixed the test broken by the original commit

Bug: 139192244
Bug: 140336855

Test: m -> flash -> boot
Test: atest CtsJvmtiAttachingHostTestCases

Change-Id: I4c67ad8709652c4710ef24564e0240f74f817f8c

5 years agoDO NOT MERGE - Merge Android 10 into master
Xin Li [Wed, 4 Sep 2019 20:33:59 +0000 (13:33 -0700)]
DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I9e3c4fe5406c9913d50fe3b07d7f7cef7a246b96

5 years agoMerge "Set SAM To Disabled On HdmiControl Disabled"
Jay Patel [Wed, 4 Sep 2019 17:53:16 +0000 (10:53 -0700)]
Merge "Set SAM To Disabled On HdmiControl Disabled"
am: 1bc876bb5b

Change-Id: If9d1bda003ca03f6579559b7d13acbadba486dcd

5 years agoMerge "Set SAM To Disabled On HdmiControl Disabled"
Jay Patel [Wed, 4 Sep 2019 17:25:08 +0000 (17:25 +0000)]
Merge "Set SAM To Disabled On HdmiControl Disabled"

5 years agoAdd NetIdManagerTest
Remi NGUYEN VAN [Thu, 1 Aug 2019 07:25:50 +0000 (16:25 +0900)]
Add NetIdManagerTest

Add a simple test to verify that IDs loop correctly, that they skip used
IDs correctly, and throw when there is no remaining ID.

Test: atest com.android.server.NetIdManagerTest
Change-Id: I4c9518c725156d743286e062fd2eec1423a0459e

5 years agoAdd ConnectivityServiceIntegrationTest
Remi NGUYEN VAN [Thu, 20 Jun 2019 09:29:36 +0000 (18:29 +0900)]
Add ConnectivityServiceIntegrationTest

This test exercises the Connectivity <-> NetworkMonitor integration.
This CL only contains a simple test (network validates), but more
generally it sets up a test package that contains both services.jar
classes and NetworkStack classes, and runs NetworkStack components in
another process (using TestNetworkStackService).

ConnectivityServiceIntegrationTest runs in the test process and binds to
TestNetworkStackService to obtain TestNetworkStackConnector and to
NetworkStackInstrumentationService to obtain
NetworkStackInstrumentationConnector. That last connector allows the
test to mock NetworkMonitor HTTP Requests.

Test: atest FrameworksNetIntegrationTests
Change-Id: Ieca18e273609044cf6b1870d2f0dba33ca7b38d3

5 years agoMerge "Change CellBroadcast APIs to SystemApi"
Jordan Liu [Tue, 3 Sep 2019 20:52:14 +0000 (13:52 -0700)]
Merge "Change CellBroadcast APIs to SystemApi"
am: 82454e029f

Change-Id: Ic39446ab84f910b0f5225ad42f061e2a525ec868

5 years agoMerge "Change CellBroadcast APIs to SystemApi"
Jordan Liu [Tue, 3 Sep 2019 20:41:03 +0000 (20:41 +0000)]
Merge "Change CellBroadcast APIs to SystemApi"

5 years agoChange CellBroadcast APIs to SystemApi
Jordan Liu [Fri, 16 Aug 2019 21:07:03 +0000 (14:07 -0700)]
Change CellBroadcast APIs to SystemApi

Bug: 135956699
Test: atest SmsManagerPermissionTest
Change-Id: Ibbb22505a80567d1c08cffe9b7a7fdbd10890abe
Merged-In: Ibbb22505a80567d1c08cffe9b7a7fdbd10890abe

5 years agoSet SAM To Disabled On HdmiControl Disabled
Hannah.Hsu [Wed, 15 May 2019 07:38:28 +0000 (15:38 +0800)]
Set SAM To Disabled On HdmiControl Disabled

Bug: 133375754

Change-Id: I2514b35429fb8a082cf74c5bb3c5fb47f16cdcc1

5 years agoCheck FIPS_mode() rather than explicitly calling BORINGSSL_self_test.
Tobias Thierer [Thu, 22 Aug 2019 20:55:15 +0000 (21:55 +0100)]
Check FIPS_mode() rather than explicitly calling BORINGSSL_self_test.

After this CL topic, BORINGSSL_self_test runs automatically when
libcrypto is loaded. It is no longer possible or necessary to
start it manually. Instead, we check that we're running in FIPS_mode(),
which guarantees that the self test has already run.

Bug: 137267623
Bug: 139918106
Test: Treehugger
Change-Id: Ic3564218de4f01c37c51c139b1ad5a435a1fd6cd

5 years agoMerge "Mark 3 tests as flaky."
Guang Zhu [Mon, 2 Sep 2019 19:03:12 +0000 (12:03 -0700)]
Merge "Mark 3 tests as flaky."
am: 1566e18657

Change-Id: Ie1c38e247ccfaa407d35cf6b6e28306d36cdccca

5 years agoMerge "Mark 3 tests as flaky."
Treehugger Robot [Mon, 2 Sep 2019 18:44:24 +0000 (18:44 +0000)]
Merge "Mark 3 tests as flaky."

5 years agoMerge "Revert "Remove a misleading "flush" function.""
Ian Kasprzak [Mon, 2 Sep 2019 15:47:30 +0000 (08:47 -0700)]
Merge "Revert "Remove a misleading "flush" function.""
am: 9fcf8b7cae

Change-Id: Ic6fafd4ed9bf6dfc001120dced903b14cf907d1d

5 years agoMerge "Revert "Remove a misleading "flush" function.""
Ian Kasprzak [Mon, 2 Sep 2019 15:28:20 +0000 (15:28 +0000)]
Merge "Revert "Remove a misleading "flush" function.""

5 years agoMerge "Simplify APIs exposed for time zone lookups"
Neil Fuller [Mon, 2 Sep 2019 14:28:52 +0000 (07:28 -0700)]
Merge "Simplify APIs exposed for time zone lookups"
am: 19de70814a

Change-Id: I011145107f9b228272814bbdc73aa8fe35a0d984

5 years agoMerge "Simplify APIs exposed for time zone lookups"
Neil Fuller [Mon, 2 Sep 2019 14:12:26 +0000 (14:12 +0000)]
Merge "Simplify APIs exposed for time zone lookups"

5 years agoMerge "Update path to the new ART APEX."
Martin Stjernholm [Mon, 2 Sep 2019 10:44:58 +0000 (03:44 -0700)]
Merge "Update path to the new ART APEX."
am: 0a4cf715f6

Change-Id: I7ab8cd227ce571041293880dfaca4e2ebb68e536

5 years agoMerge "Update path to the new ART APEX."
Martin Stjernholm [Mon, 2 Sep 2019 10:28:30 +0000 (10:28 +0000)]
Merge "Update path to the new ART APEX."

5 years agoMark 3 tests as flaky.
Guang Zhu [Mon, 2 Sep 2019 04:37:04 +0000 (21:37 -0700)]
Mark 3 tests as flaky.

Bug: 140306320
Bug: 140305589
Bug: 140305678
Test: apct/net/networking_framework_unit_test
Change-Id: I5a288d7d64b3e95e0025c2c1f4a64ffe85cc3cd6

5 years agoMerge "Refactor Module connectors for testing"
Remi NGUYEN VAN [Mon, 2 Sep 2019 03:58:34 +0000 (20:58 -0700)]
Merge "Refactor Module connectors for testing"
am: 288c75d055

Change-Id: Ie022cbb6a7f900f637647b00eef38baee28bb34d

5 years agoMerge "Refactor Module connectors for testing"
Treehugger Robot [Mon, 2 Sep 2019 03:41:32 +0000 (03:41 +0000)]
Merge "Refactor Module connectors for testing"

5 years agoMerge "Include BLE<->SPP transition states in isLeEnabled"
Dan Harms [Sun, 1 Sep 2019 21:59:54 +0000 (14:59 -0700)]
Merge "Include BLE<->SPP transition states in isLeEnabled"
am: ac413db400

Change-Id: I15a67ad7b277b345b96f2a7cf852554ed6fee267

5 years agoMerge "Include BLE<->SPP transition states in isLeEnabled"
Treehugger Robot [Sun, 1 Sep 2019 21:45:21 +0000 (21:45 +0000)]
Merge "Include BLE<->SPP transition states in isLeEnabled"