344633 Commits

Author SHA1 Message Date
Treehugger Robot
c263ce5e25 Merge "Migrate android.test.base.stubs generation to Soong." 2018-04-16 21:24:45 +00:00
Nathan Harold
fb6daf7cf7 Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE
There is still confusion about the scope of the
KEY_CARRIER_NAME_OVERRIDE. This CL further clarifies
that the carrier, for purposes of this string, is the
service provider. Thus, the CARRIER_NAME_OVERRIDE will
still be subject to SPN display rules.

Note: to use this override in scenarios such as roaming
where the display rules may not choose the name of the
home operator (and thus not choose this override), a
service provider may choose to use other flags such as
KEY_FORCE_HOME_NETWORK_BOOL and
KEY_SPN_DISPLAY_RULE_USE_ROAMING_FROM_SERVICE_STATE_BOOL
to achieve the desired display behavior.

Bug: 77461054
Test: none (docstring-only change)
Merged-In: Id866df7ef9ce593de1f9d31d2556af4bfc766a8e
Change-Id: Id866df7ef9ce593de1f9d31d2556af4bfc766a8e
(cherry picked from commit 178020a2f8c7710c90a66793176fae33108f9c15)
2018-04-16 13:53:50 -07:00
Stanley Tng
4b5cf48560 Clarify API doc for BluetoothGattServer::addService
Clarify that the caller has to wait for onServiceAdded callback before
calling BluetoothGattServer::addService again.

Bug: 72717069
Test: Compile
Change-Id: I20b031c724ba64bfd71cf10e58e587f69e4a2555
2018-04-16 13:12:52 -07:00
Hall Liu
9a51f07117 Merge "Move RTT system setting to Settings.Secure" 2018-04-16 18:40:28 +00:00
Treehugger Robot
087bae3ffe Merge "Revert "Frameworks/base: Compiled-classes support"" 2018-04-16 16:33:24 +00:00
Bernie Innocenti
5a533ae460 Merge "Teach ApfGenerator about the new opcodes for accessing data memory" 2018-04-16 05:24:29 +00:00
Tyler Gunn
3fb7c4740e Merge "Add permission whitelist for EmergencyInfo app." 2018-04-16 04:18:00 +00:00
Nan Zhang
3fece48098 Migrate android.test.base.stubs generation to Soong.
Bug: b/70351683
Test: m clean && m check-android-test-base-api
and compare the old and new stubs.jar using md5sum.

Change-Id: Ia9273016c4d3472888f970cbddf0ed85c0501eb3
2018-04-13 14:55:16 -07:00
Andreas Gampe
5d18eef165 Revert "Frameworks/base: Compiled-classes support"
This reverts commit ca775941f3b7981aabf3a6a3b84d6c94f4f76aff.

Bug: 76145463
Test: m
Change-Id: I5a368cd01812e16869352ec219eae095df4919c4
2018-04-13 13:07:56 -07:00
Treehugger Robot
828f14d58a Merge "Add filegroup for supporting apache-http stubs generation." 2018-04-13 17:28:22 +00:00
Treehugger Robot
5f29cbb53b Merge "Make android.test.mock.stubs in Android.bp" 2018-04-13 10:55:05 +00:00
Bernie Innocenti
a9949e9e25 Teach ApfGenerator about the new opcodes for accessing data memory
Bug: 73804303
Bug: 36221302
Test: runtest -x tests/net/java/android/net/apf/ApfTest.java
Change-Id: Iaf92ca0bbebaaf66d0f2f7adc1a9014607f3ecf6
2018-04-13 18:31:58 +09:00
Jiyong Park
3fb224521a Make android.test.mock.stubs in Android.bp
Stubs libraries android.test.mock.stubs and
android.test.mock.stubs-system are now built in Android.bp.
(Note that API check and update are still done in Android.mk)

As a good side effect, this allows android.test.runner[-minus-junit]
libraries (that are defined in Android.bp) to be built with the
android.test.mock.stubs instead of the runtime library
android.test.mock. This in turn allows us to prevent java:sdk ->
java:platform dependency also in Soong, because the runner libraries
were the only violators.

Bug: 73829976
Test: m -j android.test.mock.stubs android.test.mock.stubs-system
Test: m -j checkapi
Test: m -j update-api
Merged-In: I830a8eb13aa43b9aa4c8394f3c2fd91ee18b1f85
Change-Id: I830a8eb13aa43b9aa4c8394f3c2fd91ee18b1f85
(cherry picked from commit e649b8066c3385ba0b667a79d378402b15ef3127)
2018-04-13 11:21:54 +09:00
Jean-Michel Trivi
ec4f10df90 Source of deadlock between PlayerBase.mLock and
PlaybackActivityMonitor.mPlayerLock:

android.media.MediaPlayer.release()
> android.media.PlayerBase.baseRelease()
  > synchronized (mLock)
    > com.android.server.audio.PlaybackActivityMonitor.releasePlayer()
       > synchronized(mPlayerLock)
and:

com.android.server.audio.PlaybackActivityMonitor.unmutePlayersForCall()
> synchronized (mPlayerLock)
  > android.media.PlayerProxy.setVolume()
    > android.media.PlayerBase$IPlayerWrapper.setVolume()
      > android.media.PlayerBase.baseSetVolume()
        > synchronized (mLock)
          playerSetVolume()

Since system_server can have its own players, the calls to
 AudioService from PlayerBase can be synchronous, hence the
 deadlock.
The fix consists in never holding the lock in PlayerBase
 while calling into AudioService.
Refactor the playstate update into a method used for
 start / stop / pause.

Bug: 72294559
Test: see bug
Change-Id: Ib41045de124683a7484184cf63577bd2412d1362
2018-04-12 17:27:30 -07:00
Chen Xu
420ab92b0b Merge "A test api to override carrier information" 2018-04-12 22:58:37 +00:00
fionaxu
780b62b3b5 A test api to override carrier information
This API should only be used for testing purpose e.g., CTS/GTS/SL4A
By overriding carrier information, we could force a particular carrier id,
carrier's config, but also any country or carrier overlays to be loaded
when using a test SIM with a call box.

Bug: 72332597
Test: atest CtsTelephonyTestCases:CarrierIdentificationTest

Change-Id: Icd5804375ef9334c9f6c382cc6a774b9c9c15213
(cherry picked from commit 5b509b81a0d5b14148745368b153dc6b8d4482ac)
Merged-in: 5b509b81a0d5b14148745368b153dc6b8d4482ac
2018-04-12 22:19:15 +00:00
Hall Liu
bd6bf7cbe8 Merge "Make setServiceId a TestApi" 2018-04-12 20:41:44 +00:00
Hall Liu
60fd195a0a Move RTT system setting to Settings.Secure
Bug: 76449217
Test: manual
Change-Id: Id198aab697e9e37c941b0d99255e4c6a0e1f91a9
Merged-In: I85620d5b834aa7e04579212f3fd5cf6c0498b570
2018-04-12 13:39:58 -07:00
Stanley Tng
0980006a2a Merge "Add min_ce/max_ce parameters to requestLeConnectionUpdate()" 2018-04-12 14:36:12 +00:00
Chen Xu
18fe1cb2e1 Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance" 2018-04-12 04:30:18 +00:00
Hall Liu
beb880f724 Make setServiceId a TestApi
Bug: 77152869
Test: CTS
Change-Id: I26f60b48865953971de02c50db48e0ff66f4e2a0
Merged-In: I26f60b48865953971de02c50db48e0ff66f4e2a0
2018-04-11 18:23:30 -07:00
fionaxu
4801a078cd Change getGroupIdLevel1() to use subId from TelephonyManager Instance
Bug: 77905912
Test: Build
Change-Id: I720971ce115147b994e27611a0dcf052989180ec
(cherry picked from commit 272e8cf87e3aa780d7b83c021b859fdfc396f9d8)
Merged-in: 272e8cf87e3aa780d7b83c021b859fdfc396f9d8
2018-04-11 18:10:12 -07:00
Nan Zhang
99ce5c7090 Add filegroup for supporting apache-http stubs generation.
Bug: b/70351683
Test: m clean && m check-apache-http-legacy-api,
and compare the old and new stubs.jar using md5sum.

Change-Id: I0035837aef48a76e40a2c723c2adce3ff129ad28
Merged-In: I0035837aef48a76e40a2c723c2adce3ff129ad28
2018-04-11 14:57:28 -07:00
Treehugger Robot
f0e598b550 Merge "Don't unnecessarily reevaluate tethering provisioning" 2018-04-11 21:47:53 +00:00
Erik Kline
e0f34033e0 Don't unnecessarily reevaluate tethering provisioning
Registering for carrier config changes can deliver a sticky broadcast
and can cause Tethering to think something has changed and reevaluate
provisioning status, even though this has been checked before it
entered tethering mode alive state.

Additionally, move the provisioning_app{,no_ui} resources into the
TetheringConfiguration, if for no other reason than now we can log
it in .toString().

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual USB tethering toward WiFi works
Bug: 69565814
Merged-In: If254326e892b78ef9daf620f829c1def136d695c
Merged-In: I288093a1d76566e72d4889d92c7aedafc318c8b6
Merged-Id: I01c71fd971a4683bb2b6d14825d36f24a04d88a8

Change-Id: I01c71fd971a4683bb2b6d14825d36f24a04d88a8
(cherry picked from commit 1b450e3eb9106a9cc73dfc144d275141dd5017ef)
2018-04-11 13:15:55 -07:00
Tyler Gunn
f1e7cf499b Add permission whitelist for EmergencyInfo app.
This is the "Emergency Info" screen available from the lock screen.
It requires the CALL_PRIVILEGED permission in order for it to be able to
place emergency calls.  This can occur if a user adds an emergency number
to their emergency contacts.

Test: make checkbuild
Bug: 76086838
Change-Id: I76e8318c5c05bbbbdf02d2c6951f742c3bd67ea6
2018-04-11 11:05:32 -07:00
Colin Cross
1142ffcc9b Merge "Add a droiddoc generator for hwbinder.stubs" 2018-04-10 17:15:28 +00:00
Colin Cross
88a2b68252 Merge changes from topic "hidl-system-api"
* changes:
  HIDL: add APIs used by subclasses to SystemApi
  Update HIDL-related documentation.
  Add remaining missing HIDL SystemApi methods.
  HIDL: reportSyspropMethod -> enableInstrumentation
  Allow HIDL to be used in priv-apps.
2018-04-10 16:06:28 +00:00
Treehugger Robot
abb1562ca1 Merge "Revert "Don't unnecessarily reevaluate tethering provisioning"" 2018-04-10 08:35:31 +00:00
Erik Kline
e93ed61334 Revert "Don't unnecessarily reevaluate tethering provisioning"
This reverts commit 8067d78c32f545db6d35c660279ab3f2326ba41d.

Change-Id: I9098f98cb134c35692c1384339f9407b94ce6f28
2018-04-10 07:01:16 +00:00
Treehugger Robot
081014ac55 Merge "Don't unnecessarily reevaluate tethering provisioning" 2018-04-10 03:22:10 +00:00
Erik Kline
ec4ded5222 Merge "Trigger NetworkCallback events when private DNS usage has changed." 2018-04-10 03:16:07 +00:00
dalyk
7301aa4140 Trigger NetworkCallback events when private DNS usage has changed.
Relies on events sent from netd in aosp/578162.

Test: Added tests to ConnectivityServiceTest. Added a new test
class DnsManagerTest. Built a simple app that appears to
receive onLinkProperties events correctly upon manual changes
to the private DNS settings on a Pixel.
Bug: 71828272
Change-Id: I68665aaf74b7d59182cc6f9586b80b55b0dfe427
2018-04-09 16:45:22 -04:00
Treehugger Robot
ed631bf5aa Merge "Support bluetooth not using MultinetworkPolicyTracker" 2018-04-09 07:55:50 +00:00
Erik Kline
8d1fe54be1 Support bluetooth not using MultinetworkPolicyTracker
This required advancing the IpManager to IpClient refactoring
(Bluetooth used IpManager and friends). Most importantly, the
Bluetooth code used WaitForProvisioningCallback, so this is
moved into IpClient proper now. Also: some more renaming
cleanup.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 62476366
Bug: 72663849

Change-Id: I9eee2a9d5c31cdd48a054a7edc3403584efb1864
2018-04-08 23:09:36 -07:00
Erik Kline
8067d78c32 Don't unnecessarily reevaluate tethering provisioning
Registering for carrier config changes can deliver a sticky broadcast
and can cause Tethering to think something has changed and reevaluate
provisioning status, even though this has been checked before it
entered tethering mode alive state.

Additionally, move the provisioning_app{,no_ui} resources into the
TetheringConfiguration, if for no other reason than now we can log
it in .toString().

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual USB tethering toward WiFi works
Bug: 69565814
Change-Id: Ib8b2620ce44c55e5eb0afd3f00f3f5aa4fc8a593
2018-04-08 18:28:15 -07:00
Treehugger Robot
d61e87ad08 Merge "Bluetooth: Add hidden API to get current user of HID Device (1/3)" 2018-04-06 21:54:06 +00:00
Treehugger Robot
fe79660d1e Merge "Clarify doc comment for android.os.Build.VERSION.RELEASE" 2018-04-06 17:17:25 +00:00
Jayachandran Chinnakkannu
0222c2cac1 Merge "Correct the value of RESOURCES_UNAVAILABLE_OR_UNSPECIFIED" 2018-04-06 16:31:15 +00:00
Daniel Colascione
d1520aa11b Clarify doc comment for android.os.Build.VERSION.RELEASE
The RELEASE field has no guaranteed internal structure and developers
should not attempt to parse it.

Test: no code changes
Change-Id: I0ea3ab5ba5dd4cc733feb62725cf7c62c00c857b
2018-04-06 08:36:18 -07:00
Jayachandran C
7957147bbe Correct the value of RESOURCES_UNAVAILABLE_OR_UNSPECIFIED
Test: Build
Bug: 77657541
Change-Id: Ia6b576c222776cbc7e54e15cb54e39775e76ea56
2018-04-06 01:10:38 -07:00
Treehugger Robot
454b1e37eb Merge "Remove an API that doesn't exist." 2018-04-06 00:31:20 +00:00
Treehugger Robot
04233ef175 Merge "Move the logic of (re)evaluation of Private DNS" 2018-04-05 23:52:55 +00:00
Erik Kline
736353a584 Move the logic of (re)evaluation of Private DNS
Moves this out of ConnectivityService and into each NetworkMonitor
(where it's more self-contained).

Test: as follows
    - builds, flashes, boots
    - runtest frameworks-net passes
    - manual testing with working and non-working hostnames behaves
      somewhat (but not entirely) as expected, and not always quickly
Bug: 64133961
Bug: 72345192
Bug: 73872000
Bug: 77140445
Change-Id: Ic4322af3cb49149f2d975cb31f54b2ac7927f907
2018-04-05 15:17:38 -07:00
Dan Albert
d377f90dc7 Remove an API that doesn't exist.
Apparently this was removed in Jelly Bean:
https://stackoverflow.com/q/24312632/632035. Keeping the decl in the
NDK just confuses people: https://stackoverflow.com/q/49646596/632035.

Test: make checkbuild
Bug: None
Change-Id: If549fcd8f4052e633646c4ce8a054a0bbcd8b2bf
2018-04-05 15:00:00 -07:00
Treehugger Robot
8d5a39ac62 Merge "Remove duplicate definitions of utility variables" 2018-04-04 23:04:08 +00:00
Treehugger Robot
3b5016598d Merge "Add Polish keycharactermap" 2018-04-04 22:10:19 +00:00
Treehugger Robot
a23007dd54 Merge "Hearing Aid: change get/set active device (3/3)" 2018-04-04 21:42:17 +00:00
Treehugger Robot
46be1f15af Merge "Modify isShowing method in Dialog" 2018-04-04 18:39:38 +00:00
Benedict Wong
119cf2bc61 Merge "Force creation of Socket upon Transform application" 2018-04-04 17:14:46 +00:00