44702 Commits

Author SHA1 Message Date
Jack He
097a89513e Remove BluetoothDevice.ACTION_DISAPPEARED
This intent was never sent by the Bluetooth stack

Fixes: 112115770
Test: make
Change-Id: Iaf71aeafa21f44ec9b59c1b766c936ab7dde39f1
2018-10-11 21:06:29 +00:00
Treehugger Robot
cf1176073d Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" 2018-10-11 03:32:10 +00:00
Jack He
4618ce3a06 Remove BluetoothDevice.ACTION_DISAPPEARED
This intent was never sent by the Bluetooth stack

Bug: 112115770
Test: make
Change-Id: I6c2b87529af7e6a7123cde8141fbdb9d1822ec9f
Merged-In: I6c2b87529af7e6a7123cde8141fbdb9d1822ec9f
(cherry picked from commit dd1c592fcd11e2bee25db0077da0ef3f59071d5d)
2018-10-10 17:43:32 -07:00
Treehugger Robot
e75f2f504e Merge changes from topic "aapt2-manifest-elements"
* changes:
  Remove workarounds for b/79755007
  AAPT2: Add the rest of supported manifest elements
  AAPT2: Add supported manifest elements
2018-10-10 22:29:57 +00:00
Michael Groover
403813782f Merge "Add READ_PRIVILEGED_PHONE_STATE to used permissions" 2018-10-09 23:07:13 +00:00
Treehugger Robot
d05c9bc51c Merge "Convert PrintSpooler to Android.bp" 2018-10-09 21:50:40 +00:00
Michael Groover
1248e435a0 Add READ_PRIVILEGED_PHONE_STATE to used permissions
Bug: 110099294
Test: cts-tradefed run cts -m CtsTelephonyTestCases -t android.telephony.cts.TelephonyManagerTest
Change-Id: I13fec3d397c200ce92883883c96c07007e823efe
2018-10-08 11:29:03 -07:00
Treehugger Robot
85666351d7 Merge "DO NOT MERGE Synchronize ZenModeControllerImpl callbacks" 2018-10-05 15:38:39 +00:00
Julia Reynolds
93d878f49e Add AndroidTest file for ExtServices
Test: make
Bug: 111475013, 117228643
Change-Id: Id649a1ed2109dee87bb8c61c3a161efe99c5e457
Merged-In: Id649a1ed2109dee87bb8c61c3a161efe99c5e457
(cherry picked from commit cfd2692a94503753bf9abcffdb40ed2de682dd41)
2018-10-03 16:43:09 -07:00
Colin Cross
278a04aa6b Convert PrintSpooler to Android.bp
See build/soong/README.md for more information.

Bug: 80095087
Test: atest PrintSpoolerOutOfProcessTests
Change-Id: I9d641b9c480745ccee323aa0f758cd6a146e0638
2018-10-03 14:45:26 -07:00
Treehugger Robot
fce8595437 Merge "Add SapProfile to LocalBluetoothProfileManager (1/2)" 2018-10-03 18:04:28 +00:00
Beverly
503ae21287 DO NOT MERGE Synchronize ZenModeControllerImpl callbacks
Test: manual
Bug: 115688927
Change-Id: Ib47913c7b5522c40405fadd97d570d5f197f71dc
2018-10-03 12:36:04 -04:00
Nandana Dutt
7eaa2cbf51 Merge "Disable the buginfo dialog on AndroidTV" 2018-10-03 15:39:22 +00:00
Chienyuan
2be42b972c Add SapProfile to LocalBluetoothProfileManager (1/2)
* add SapProfile and related logic to LocalBluetoothProfileManager
* simplify logic for connect and disconnect in SapProfile
* connect: remove connected device check logic. SapService will
  return false directly.
* disconnect: remove connected device check logic. SapService will
  check it.
* getConnectionStatus: remove connected device check logic.
  SapService will check it.
* remove member variable V and related checks.
* wrap if/else statement in curly brackets.
* add robotest for SapProfile.

Bug: 116281023
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=SapProfileTest
Change-Id: I2efc1beb7a12e1ec412baf54f895d2ebe930e8f1
Merged-In: I2efc1beb7a12e1ec412baf54f895d2ebe930e8f1
2018-10-03 11:05:31 +00:00
Nandana Dutt
702587e787 Merge "Warn about sensitive bugreport contents." 2018-10-03 09:51:59 +00:00
Nandana Dutt
729ae07a36 Merge "Synchronize access to sNotificationBundle." 2018-10-03 08:55:01 +00:00
Treehugger Robot
9073dc4839 Merge "Remove unused / invalid import" 2018-10-02 21:46:01 +00:00
Felipe Leme
ed5e51dbb2 Synchronize access to sNotificationBundle.
Otherwise Shell can crash due to ConcurrentModificationException

Test: atest BugreportReceiverTest
Test: manual verification

Fixes:116280360

Change-Id: I138acd43b313d2a7a9d945fb44a9d63e1ad798eb
Merged-In: I138acd43b313d2a7a9d945fb44a9d63e1ad798eb
(cherry picked from commit ee72fa19a97f2b0677a130204e3527bc3233e4d9)
2018-10-02 11:39:42 +01:00
Jeff Sharkey
e70a61d56d Warn about sensitive bugreport contents.
We show this message when clicking a notification, but we also want
to alert users when they're picking files to attach/share.

Bug: 114711671
Test: manual
Change-Id: I23e249c93d6fa9cf960ef2a61d3fe769eb56ddf5
Merged-In: I23e249c93d6fa9cf960ef2a61d3fe769eb56ddf5
(cherry picked from commit 59137825eb11e6ca4c53e43a9973983ebdd09b33)
2018-10-02 11:34:50 +01:00
Kristian Monsen
86f69db5c0 Disable the buginfo dialog on AndroidTV
Bug: 113033835
Test: Tested manually on Atom
Change-Id: If65997e28db7c0100018145f9313549494e41a2a
Merged-In: If65997e28db7c0100018145f9313549494e41a2a
(cherry picked from commit cb68d29f03f14b188ccc02b877161173b631685d)
(cherry picked from commit 01badb78744bc48e35215556a49ac97a17cbce3a)
2018-10-02 11:31:27 +01:00
Neil Fuller
4ff327141d Remove unused / invalid import
NavigationBarCompat imports sun.misc.Resource though
it doesn't need it.

Bug: 113148576
Test: build only
Change-Id: I26d6e0b3d9a8948333fdf9f3659b87b3b46a75d5
2018-10-01 11:32:36 +01:00
Jin Dong
16c8c0aef5 Add vendor notice header at the top of Third-party licenses
Vendor can add notice header at the top of "Third-party licenses"
by overlay the string notice_header.

Fixes: 116298367
Change-Id: If80d69180664970441d0addccd81d65d7ab55c3b
Merged-In: If80d69180664970441d0addccd81d65d7ab55c3b
2018-09-28 20:19:07 +00:00
Jordan Liu
eb1d6d91af Merge "Dismiss SIM lock page after correct SIM" 2018-09-26 23:42:55 +00:00
Jordan Liu
b4299d92e6 Dismiss SIM lock page after correct SIM
Previously the criteria was to dismiss if:
1. There is no pin/password/pattern set AND
2. the lockscreen is disabled.

This behaved incorrectly in the case where the lockscreen is enabled
but there is no pin/password/pattern set.

We fix the condition so that now we dismiss the SIM lock if:
1. There is no pin/password/pattern set OR
2. the lockscreen is disabled.

Fixes: 115780994
Test: manual
Change-Id: I88da896add635126934eb0ed22e617ac2607f15a
2018-09-26 12:59:57 -07:00
Leon Liao
e238a19aa5 Merge "Rename method isConnectable()" 2018-09-25 23:06:20 +00:00
Leon Liao
3b5e6bd4e1 Rename method isConnectable()
LocalBluetoothProfile.isConnectable() checks whether the user can initiate a connection
for a specific profile, not really whether the profile is connectable.

Change-Id: If6c6cd1554acf35db2460ea6ddb65148a7e86e45
Bug: 79982487
Test: build
2018-09-20 09:21:26 +08:00
Hisanobu, Watanabe
67c1d26a07 Fix NullPointerException in CaptivePortalLogin
[Problem]
After reboot, the CaptivePortalLogin crashes when start the
CaptivePortalLogin from Recents Screen.

[Root Cause]
Although Network class is null, Network#getPrivateDnsBypassingCopy is
called at CaptivePortalLoginActivity

[Solution]
To check if NetworkCapabilities is null before
Network#getPrivateDnsBypassingCopy

Bug: 113303484
Test: built, boot and manual

Change-Id: Icff8446fefa9700dcbcd1f8f1e4edeaf4b0d3557
2018-09-19 15:15:29 +09:00
Treehugger Robot
7cfbdcc481 Merge "Simplify logic for connect in PbapClientProfile" 2018-09-19 04:24:19 +00:00
Treehugger Robot
b545c70d1d Merge "Simplify logic for getConnectionStatus in HidDeviceProfile" 2018-09-19 02:08:33 +00:00
Treehugger Robot
0ac2a840a0 Merge "Simplify logic for connect in MapClientProfile" 2018-09-19 02:08:05 +00:00
Chienyuan
a16ad76a81 Simplify logic for connect in MapClientProfile
* connect: remove connected device check logic. MapClientService
  will check it.
* remove member variable V and related checks.
* wrap if/else statement in curly brackets.
* add robotest for MapClientProfile.

Bug: 111812003
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=MapClientProfileTest
Change-Id: Ic3620c8910e5acbb14e33369ff437d434b514ddf
Merged-In: Ic3620c8910e5acbb14e33369ff437d434b514ddf
2018-09-18 11:14:40 +08:00
Chienyuan
d8ebc8db54 Simplify logic for connect in PbapClientProfile
* connect: remove connected device check logic. PbapClientService
  will check it.
* remove member variable V and related checks.
* wrap if/else statement in curly brackets.
* add robotest for PbapClientProfile.

Bug: 111812003
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=PbapClientProfileTest
Change-Id: Ide43ee5cec560945ad69639782ad6f214ea0cece
Merged-In: Ide43ee5cec560945ad69639782ad6f214ea0cece
2018-09-18 10:21:50 +08:00
Yuanjia Hsu
55b91f6d93 Merge "Add feature flag in Settings." 2018-09-17 13:43:08 +00:00
Shaotang Li
0b925f85c0 Merge "Add extra data when starting emergency dialer intent" 2018-09-17 04:14:51 +00:00
Chienyuan
932e63b32e Simplify logic for getConnectionStatus in HidDeviceProfile
* getConnectionStatus: remove connected device check logic.
  HidDeviceService will check it.
* rewrite the annotation about this class
* remove member variable DEBUG and related checks.
* add robotest for HidDeviceProfile

Bug: 111812003
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=HidDeviceProfileTest
Change-Id: I2e7fdd69a46707339a32db4304666e50fd0cf954
Merged-In: I2e7fdd69a46707339a32db4304666e50fd0cf954
2018-09-17 03:30:15 +00:00
Colin Cross
f5c86dc1c1 Remove workarounds for b/79755007
aapt2 now recognizes these manifest elements.

Bug: 79755007
Test: m checkbuild
Change-Id: I2718fc973e08e7f5226b009807312bd534216f8d
2018-09-13 22:25:58 -07:00
Evan Laird
375af769e6 Merge "Leave spaces between Operator name and Clock in StatusBar" 2018-09-13 17:24:09 +00:00
Shigeki Yokomichi
52a11bbe15 Leave spaces between Operator name and Clock in StatusBar
In StatusBar, there are no spaces between Operator name and Clock,
so leaving spaces to improve design.

Bug: 114133664
Test: Manual, enable operator name in status row
config_showOperatorNameInStatusBar, insert sim card with operator name,
watch status row.

Change-Id: I1a2e33436ed50d429ae4b1769d0a72d501233a22
2018-09-13 11:39:30 +00:00
Treehugger Robot
e7f1dc6661 Merge "Remove the last of the ResolvUtil uses" 2018-09-13 06:39:16 +00:00
Treehugger Robot
57d9052ce8 Merge "Simplify logic for connect in HfpClientProfile" 2018-09-13 03:00:19 +00:00
Treehugger Robot
eff45f36cf Merge "Simplify logic for connect in A2dpSinkProfile" 2018-09-13 02:58:50 +00:00
Chienyuan
b6e4b8ab58 Simplify logic for connect in HfpClientProfile
* connect: remove connected device check logic.
  HeadsetClientStateMachine will check it.
* Remove member variable V and related checks.
* wrap if/else statement in curly brackets.
* add robotest for HfpClientProfile.

Bug: 111812003
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=HfpClientProfileTest
Change-Id: Ie36efd6d0a9f8e6501a3690b026ea4bd39744b5c
Merged-In: Ie36efd6d0a9f8e6501a3690b026ea4bd39744b5c
2018-09-12 15:24:37 +08:00
Chienyuan
dcbc7def1f Simplify logic for connect in A2dpSinkProfile
* connect: remove connected device check logic. A2dpSinkService
  will check it.
* Remove member variable V and related checks.
* wrap if/else statement in curly brackets.
* add robotest for A2dpSinkProfile.

Bug: 111812003
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=A2dpSinkProfileTest
Change-Id: Ia0a118d73e5bb35ed3b2b75e67aeb98ae936981f
Merged-In: Ia0a118d73e5bb35ed3b2b75e67aeb98ae936981f
2018-09-12 15:15:42 +08:00
Erik Kline
95999bda8d Remove the last of the ResolvUtil uses
This is the completion of cleanup work started in aosp/674269.
Consequently, also remove ResolvUtil.

Test: as follows
    - built, flashed, booted
    - runtest frameworks-net passes
    - presubmit
Bug: 64133961
Bug: 72345192
Bug: 73872000
Bug: 78548486
Change-Id: I980f8a9b67f3f06f2d97a60f8e58e92c36316d40
2018-09-12 14:58:58 +09:00
Treehugger Robot
e899768988 Merge "DO NOT MERGE base: getDataUsageInfo get cycle validation" 2018-09-11 22:02:49 +00:00
John Zhao
99c1ddc921 DO NOT MERGE base: getDataUsageInfo get cycle validation
When the DataUsageController calculate the DataUsageInfo
based on the cycle from NetworkPolicyManager, that cycle
should be not null. Otherwise, it couldn't be used to do
operation like toInstant() directly.

The error could be got from logcat is as:
E AndroidRuntime: Caused by: java.lang.NullPointerException:
Attempt to invoke virtual method 'java.time.Instant
java.time.ZonedDateTime.toInstant()' on a null object reference

E AndroidRuntime:          at com.android.settingslib.net.
DataUsageController.getDataUsageInfo
(DataUsageController.java:140)

Inside of the core/java/android/net/NetworkPolicyManager.java:
public static Iterator<Pair<ZonedDateTime, ZonedDateTime>>
 cycleIterator(NetworkPolicy policy) {
... ...
return Pair.create(null, null);
... ...
}
That should be avoided.

Considering it could be happened in the NetworkPolicyManager side,
and it is reasonable if it did it, validating operation is better
to be considered by any caller such as the DataUsageController.

Bug: 113952713

Test: specify the hasNext to be false but the DataUsageController
don't crash.

Change-Id: I2469c129a160e30615ea6011adf18688f951eac8
Signed-off-by: John Zhao <yuankuiz@qualcomm.corp-partner.google.com>
2018-09-11 20:47:06 +00:00
yuanjiahsu
88363e9b2f Add feature flag in Settings.
User can enable/disable faster emergency phone call feature by switching
this flag from Settings, and the old flag switched by adb command was
replaced by this feature flag.

Test: Manually
Bug: 113539598
Change-Id: Ie38f4657bfd76d8386ce2a075f4ec5d0038f5c3d
2018-09-11 15:04:51 +08:00
Erik Kline
b1ac188be9 Remove services.net JAR dependency
Test: as follows
    - built, flashed, booted
    - runtest frameworks-net passes
    - captive portal interaction works as expected in Private DNS
      strict mode
Bug: 64133961
Bug: 72345192
Bug: 73872000
Bug: 78548486

Merged-In: Ia2ab2fb15e7898d99d30da20699e0bbd7a5a0964
Change-Id: I290811305fd89a4fb5633b47173aaec28e9ed4b5
2018-09-11 14:59:16 +09:00
Treehugger Robot
beeb35f0de Merge "Simplify logic for disconnect and getConnectionStatus in MapProfile" 2018-09-11 03:49:37 +00:00
Chienyuan
f5b1c1d045 Simplify logic for disconnect and getConnectionStatus in MapProfile
* disconnect: remove connected device check logic. BluetoothMapService
  will check it.
* getConnectionStatus: remove connected device check logic.
  BluetoothMapService will check it.
* Rewrite the annotation about this class.
* Remove member variable V and related checks.
* wrap if/else statement in curly brackets.

Bug: 111812003
Test: manual - disconnect MAP from Settings UI
Change-Id: I2469821f0ae2e3f384844326b30c7d3c4c88ab63
2018-09-09 08:21:21 +00:00