OSDN Git Service

android-x86/frameworks-base.git
6 years agoRemove compiled classes list
Mathieu Chartier [Tue, 12 Dec 2017 19:17:01 +0000 (11:17 -0800)]
Remove compiled classes list

No longer used.

(cherry-picked from commit c87f8124bc1b79969f512f67d5d7f837b4cf28f7)

Bug: 37966211
Test: make
Merged-In: I5a1ef82ed6d8cf771513b86960c3d1d8cf7418f9
Change-Id: I5a1ef82ed6d8cf771513b86960c3d1d8cf7418f9

6 years agoMerge "Fix an incorrect display position of error popup in RTL layout"
Siyamed Sinir [Tue, 12 Dec 2017 03:57:43 +0000 (03:57 +0000)]
Merge "Fix an incorrect display position of error popup in RTL layout"

6 years agoMerge "Add CarrierConfig key for RTT support"
Hall Liu [Tue, 12 Dec 2017 01:44:08 +0000 (01:44 +0000)]
Merge "Add CarrierConfig key for RTT support"

6 years agoMerge "Revert "Add support for send Message with messaging options""
Amit Mahajan [Tue, 12 Dec 2017 01:04:54 +0000 (01:04 +0000)]
Merge "Revert "Add support for send Message with messaging options""

6 years agoMerge "Add carrier config to always play hold tone when remotely held."
Treehugger Robot [Tue, 12 Dec 2017 00:56:37 +0000 (00:56 +0000)]
Merge "Add carrier config to always play hold tone when remotely held."

6 years agoRevert "Add support for send Message with messaging options"
Amit Mahajan [Mon, 11 Dec 2017 23:30:35 +0000 (23:30 +0000)]
Revert "Add support for send Message with messaging options"

This reverts commit bbef627077c5126b5b1292a5a396d784218c09cf.

Reason for revert: Causing long sms failure

Bug: 68762942
Change-Id: I43c36e3286105459c7e08d1a0b2d89b4c42140b2

6 years agoMerge "Carrier confirmation code."
Holly Jiuyu Sun [Mon, 11 Dec 2017 23:29:34 +0000 (23:29 +0000)]
Merge "Carrier confirmation code."

6 years agoAdd CarrierConfig key for RTT support
Hall Liu [Tue, 21 Nov 2017 00:25:39 +0000 (16:25 -0800)]
Add CarrierConfig key for RTT support

Add the carrier config key.

Test: add fake support for some random carrier, look for the capability
Bug: 63934808
Change-Id: I8a0e33a7ac10fbdcad356059913e7ddcba26bb6c

6 years agoMerge "Fixed button bar alignment issue in RTL languages"
Treehugger Robot [Mon, 11 Dec 2017 19:10:46 +0000 (19:10 +0000)]
Merge "Fixed button bar alignment issue in RTL languages"

6 years agoMerge "[DeadLock]AMS PMS MountService"
Treehugger Robot [Mon, 11 Dec 2017 15:47:45 +0000 (15:47 +0000)]
Merge "[DeadLock]AMS PMS MountService"

6 years agoMerge "DefaultNetworkEvent: fix two bugs with validation times"
Hugo Benichi [Sun, 10 Dec 2017 23:54:13 +0000 (23:54 +0000)]
Merge "DefaultNetworkEvent: fix two bugs with validation times"

6 years agoMerge "Revert "Remove empty ScopedArray constructor.""
Nicolas Geoffray [Sat, 9 Dec 2017 13:26:00 +0000 (13:26 +0000)]
Merge "Revert "Remove empty ScopedArray constructor.""

6 years agoRevert "Remove empty ScopedArray constructor."
Nicolas Geoffray [Sat, 9 Dec 2017 13:25:26 +0000 (13:25 +0000)]
Revert "Remove empty ScopedArray constructor."

Libcore tests still fail.

This reverts commit cee368b2b8299db5808284a30e2aa14d0aff8b4a.

Change-Id: I4bcdb7bf08d09d563e54cd8fe005402ae3579164

6 years agoDefaultNetworkEvent: fix two bugs with validation times
Hugo Benichi [Wed, 6 Dec 2017 04:28:09 +0000 (13:28 +0900)]
DefaultNetworkEvent: fix two bugs with validation times

This patch fixes two bugs around the validation time calculation for
default network metrics:
  - for events representing the absence of a default network, the
    validation time was not correctly set to 0.
  - for events representing a default network, the validation time was
    always set to the duration time. This was overlooked by commit
    380a0638588d.

Also fix a minor printing padding issue in DefaultNetworkEvent#toString

Test: manually inspected the output of $ adb shell dumpsys connmetrics
      while enabling and disabling wifi.

Change-Id: I0eb4ccdf7a61d3097d0661104cb40d738e59772a

6 years agoMerge "BootReceiver: Added an event log after the dropbox file copy is successful."
Treehugger Robot [Sat, 9 Dec 2017 02:55:20 +0000 (02:55 +0000)]
Merge "BootReceiver: Added an event log after the dropbox file copy is successful."

6 years agoMerge "Revert "Send empty LinkProperties when entering StoppedState.""
Treehugger Robot [Sat, 9 Dec 2017 01:34:07 +0000 (01:34 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState.""

6 years agoCarrier confirmation code.
Holly Jiuyu Sun [Sat, 14 Oct 2017 02:06:34 +0000 (19:06 -0700)]
Carrier confirmation code.

If confirmation code is null and required during downloading a profile,
returns a resovable error, and show ConfirmationCodeActivity. After we
get the confirmation code from the user, continue the operation.

Add the confirmationCode as a member in DownloadableSubscription.

Merged-In: Ibe1e0fc5ddb736b411faf48ec9bea3c68972bb99
Test: unit test, e2e on phone
Bug: 36730837
Change-Id: Ibe1e0fc5ddb736b411faf48ec9bea3c68972bb99

6 years agoMerge "[AWARE] Make PeerHandle comparable/hashable"
Etan Cohen [Fri, 8 Dec 2017 23:58:36 +0000 (23:58 +0000)]
Merge "[AWARE] Make PeerHandle comparable/hashable"

6 years agoBootReceiver: Added an event log after the dropbox file copy is successful.
Siyuan Zhou [Mon, 4 Dec 2017 21:02:11 +0000 (13:02 -0800)]
BootReceiver: Added an event log after the dropbox file copy is successful.

The log can be used to test if LAST KMSG or other items are copied
to dropbox successfully, especially in user builds without root
privilege.

BUG: 69685635

Test: manually verified the desired log from bugreport on user
and userdebug builds.

Change-Id: I6570d95538d678c98d261690ca3c20416d7a31c6
Merged-In: Ie6033bf04c7f79fc596761ab751aa5fcea2c1130
(cherry-picked from commit bafcd7b59519ce67738c870cf9b69a7c0583cc9b)

6 years agoRevert "Send empty LinkProperties when entering StoppedState."
Roshan Pius [Fri, 8 Dec 2017 22:29:50 +0000 (22:29 +0000)]
Revert "Send empty LinkProperties when entering StoppedState."

This reverts commit b3f9f4a30502477e71fc93037dc58080fddb1853.

Reason for revert: Crash in WifiStateMachine (b/70394432)

Change-Id: I3a96c822eddcebcdd6621cee878b865171d094e8

6 years agoMerge "Bluetooth: Fix boolean logic in quiet mode enable"
Jack He [Fri, 8 Dec 2017 22:13:27 +0000 (22:13 +0000)]
Merge "Bluetooth: Fix boolean logic in quiet mode enable"

6 years agoBluetooth: Fix boolean logic in quiet mode enable
Jack He [Fri, 8 Dec 2017 20:21:37 +0000 (12:21 -0800)]
Bluetooth: Fix boolean logic in quiet mode enable

* Change If97c454a8e5aff34c4f8550f7ade3da413a200b7 introduced a bug that
  flipped the logic of quiet mode enable in the handler for
  MESSAGE_BLUETOOTH_SERVICE_CONNECTED, causing quiet mode to be enabled
  when toggling from Settings and system UI.

Bug: 70395489
Test: make, toggle bluetooth on/off
Change-Id: I405fb462783df0d52d9ce84d2ebe959e56a1aa30

6 years agoMerge "Remove empty ScopedArray constructor."
Treehugger Robot [Fri, 8 Dec 2017 20:07:33 +0000 (20:07 +0000)]
Merge "Remove empty ScopedArray constructor."

6 years agoMerge "Add Azerbaijani keyboard layout"
Treehugger Robot [Fri, 8 Dec 2017 19:53:14 +0000 (19:53 +0000)]
Merge "Add Azerbaijani keyboard layout"

6 years agoAdd Azerbaijani keyboard layout
Adil Aliyev [Tue, 5 Dec 2017 18:41:14 +0000 (03:41 +0900)]
Add Azerbaijani keyboard layout

KCM for Azerbaijani keyboard is added.

Change-Id: I6190607b4319a98f41d776b476b68e08ce4b07a2
Signed-off-by: Adil Aliyev <adilaliev@gmail.com>
6 years agoMerge "Remove logtags property"
Colin Cross [Fri, 8 Dec 2017 16:14:07 +0000 (16:14 +0000)]
Merge "Remove logtags property"

6 years agoFixed button bar alignment issue in RTL languages
susanta.patra [Fri, 8 Dec 2017 06:25:40 +0000 (11:55 +0530)]
Fixed button bar alignment issue in RTL languages

Buttons should be aligned opposite to English in RTL languages.

Test: 1. RTL language
      2. Create an alert dialog having positive, negative and neutral button.
      3. Check the button bar alignment
Bug: 70363698

Change-Id: I783dfdcf9cb3f85402a4ff3fa4c2d1d1caf5c3da
Signed-off-by: susanta.patra <susanta.patra@lge.com>
6 years agoMerge "Refactor to IpNeighborMonitor and single-threaded semantics"
Treehugger Robot [Fri, 8 Dec 2017 05:44:26 +0000 (05:44 +0000)]
Merge "Refactor to IpNeighborMonitor and single-threaded semantics"

6 years agoMerge "Send empty LinkProperties when entering StoppedState."
Treehugger Robot [Fri, 8 Dec 2017 03:14:09 +0000 (03:14 +0000)]
Merge "Send empty LinkProperties when entering StoppedState."

6 years agoRefactor to IpNeighborMonitor and single-threaded semantics
Erik Kline [Fri, 19 May 2017 00:29:48 +0000 (09:29 +0900)]
Refactor to IpNeighborMonitor and single-threaded semantics

IpReachabilityMonitor (and IpNeighborMonitor) are only accessed from
the IpManager StateMachine's thread. Consequently lots of locking can
now be removed.

Additionally:
    - rename BlockingSocketReader to PacketReader
    - incorporate IpReachabilityMonitor output in dump()

Test: as follows
    - runtest frameworks-net passes
    - "adb shell ip neigh change <address> dev wlan0 nud failed"
      triggers wifi to disconnect
Bug: 62476366
Bug: 67013397
Change-Id: I18aca29ae0019a72a7e559c2832e0d9b0e33d81e

6 years agoRemove logtags property
Colin Cross [Fri, 8 Dec 2017 01:55:05 +0000 (17:55 -0800)]
Remove logtags property

logtags previously needed to be listed in logtags and srcs, now
they only need to be listed in logtags.

Test: m checkbuild
Change-Id: I7750116675d9497782642a9b8c86288d42bf0a54

6 years agoMerge "Convert services/core/jni to Android.bp"
Colin Cross [Fri, 8 Dec 2017 01:20:47 +0000 (01:20 +0000)]
Merge "Convert services/core/jni to Android.bp"

6 years agoMerge "BT: Remove dead code in BluetoothHeadset"
Treehugger Robot [Fri, 8 Dec 2017 01:14:59 +0000 (01:14 +0000)]
Merge "BT: Remove dead code in BluetoothHeadset"

6 years ago[DeadLock]AMS PMS MountService
luozhanwei [Tue, 5 Dec 2017 13:31:36 +0000 (21:31 +0800)]
[DeadLock]AMS PMS MountService

Umount externel srotage when phone boot.
It  may trigger below dead lock in system_server in the board with external adoptable storage
as below stack:

"Binder_6" prio=5 tid=57 Blocked
  | group="main" sCount=1 dsCount=0 obj=0x12fa7fa0 self=0x7f9674d000
  | sysTid=3218 nice=0 cgrp=default sched=0/0 handle=0x7f941a3440
  | state=S schedstat=( 450091692 353243785 1757 ) utm=30 stm=15 core=8 HZ=100
  | stack=0x7f940a7000-0x7f940a9000 stackSize=1013KB
  | held mutexes=
  at com.android.server.MountService.getVolumeList(MountService.java:3014)
  - waiting to lock <0x064315bf> (a java.lang.Object) held by thread 14                                        B
  at android.os.storage.StorageManager.getVolumeList(StorageManager.java:918)
  at android.os.storage.StorageManager.getStorageVolume(StorageManager.java:853)
  at android.os.Environment.isExternalStorageEmulated(Environment.java:742)
  at android.os.Environment.isExternalStorageEmulated(Environment.java:730)
  at com.android.server.pm.PackageManagerService.isExternalMediaAvailable(PackageManagerService.java:10378)
  at com.android.server.pm.PackageManagerService.nextPackageToClean(PackageManagerService.java:10385)
  - locked <0x05b654c7> (a android.util.ArrayMap)                                                              A
  at android.content.pm.IPackageManager$Stub.onTransact(IPackageManager.java:1636)
  at com.android.server.pm.PackageManagerService.onTransact(PackageManagerService.java:2937)
  at android.os.Binder.execTransact(Binder.java:458)

"android.fg" prio=5 tid=14 Blocked
  | group="main" sCount=1 dsCount=0 obj=0x12da1f90 self=0x7fa9ad8800
  | sysTid=1792 nice=0 cgrp=default sched=0/0 handle=0x7f9867f440
  | state=S schedstat=( 79482537 29476078 684 ) utm=4 stm=4 core=5 HZ=100
  | stack=0x7f9857d000-0x7f9857f000 stackSize=1037KB
  | held mutexes=
  at com.android.server.am.ActivityManagerService.broadcastIntent(ActivityManagerService.java:19159)
  - waiting to lock <0x074b3319> (a com.android.server.am.ActivityManagerService) held by thread 98           C
  at android.app.ContextImpl.sendBroadcastAsUser(ContextImpl.java:942)
  at com.android.server.MountService.onVolumeStateChangedLocked(MountService.java:1424)
  at com.android.server.MountService.onEventLocked(MountService.java:1134)
  at com.android.server.MountService.onEvent(MountService.java:1039)
  - locked <0x064315bf> (a java.lang.Object)                                                                  B
  at com.android.server.NativeDaemonConnector.handleMessage(NativeDaemonConnector.java:135)
  at android.os.Handler.dispatchMessage(Handler.java:107)
  at android.os.Looper.loop(Looper.java:207)
  at android.os.HandlerThread.run(HandlerThread.java:61)
  at com.android.server.ServiceThread.run(ServiceThread.java:46)

"Binder_F" prio=5 tid=98 Blocked
  | group="main" sCount=1 dsCount=0 obj=0x13f740a0 self=0x7f96ab6400
  | sysTid=3483 nice=0 cgrp=default sched=0/0 handle=0x7f8dbb7440
  | state=S schedstat=( 472520780 311910624 1572 ) utm=35 stm=12 core=6 HZ=100
  | stack=0x7f8dabb000-0x7f8dabd000 stackSize=1013KB
  | held mutexes=
  at com.android.server.pm.PackageManagerService.queryContentProviders(PackageManagerService.java:5974)
  - waiting to lock <0x05b654c7> (a android.util.ArrayMap) held by thread 57                                   A
  at com.android.server.am.ActivityManagerService.generateApplicationProvidersLocked(ActivityManagerService.java:10786)
  at com.android.server.am.ActivityManagerService.attachApplicationLocked(ActivityManagerService.java:7405)
  at com.android.server.am.ActivityManagerService.attachApplication(ActivityManagerService.java:7577)
  - locked <0x074b3319> (a com.android.server.am.ActivityManagerService)                                       C
  at android.app.ActivityManagerNative.onTransact(ActivityManagerNative.java:513)
  at com.android.server.am.ActivityManagerService.onTransact(ActivityManagerService.java:2764)
  at android.os.Binder.execTransact(Binder.java:458)

Change-Id: Iec16ae1353cba7879838e3116d50f7cdeaee285c
Signed-off-by: luozhanwei <luozhanwei@xiaomi.com>
6 years agoMerge "IMS: Add support for STK CC feature"
Jordan Liu [Fri, 8 Dec 2017 00:14:57 +0000 (00:14 +0000)]
Merge "IMS: Add support for STK CC feature"

6 years agoMerge "Fix available/remaining PIN/PUK attempts."
Jordan Liu [Thu, 7 Dec 2017 23:17:11 +0000 (23:17 +0000)]
Merge "Fix available/remaining PIN/PUK attempts."

6 years agoConvert services/core/jni to Android.bp
Colin Cross [Wed, 6 Dec 2017 01:33:58 +0000 (17:33 -0800)]
Convert services/core/jni to Android.bp

See build/soong/README.md for more information.

Test: m checkbuild
Change-Id: I11a9a39d14adc4c202c6a1725e92e52a38ff2585
Merged-In: I11a9a39d14adc4c202c6a1725e92e52a38ff2585
(cherry picked from commit 1742dd8cf301904f8fd6e173a08ec8c1888b606e)

6 years ago[AWARE] Make PeerHandle comparable/hashable
Etan Cohen [Mon, 4 Dec 2017 15:53:31 +0000 (07:53 -0800)]
[AWARE] Make PeerHandle comparable/hashable

Add public equals()/hash() methods to PeerHandle. Allows the handle to
be used across multiple calls/sessions.

(cherry-pick of commit 4454bda052aea4087880674bb0e0f81ce2647009)

Bug: 68931709
Test: builds, unit test, integration test
Change-Id: Id06659a640931585893f21b9ee04982d921fe511
Merged-In: I87df50edb948a7afc90e496165013235ddca1e48

6 years agoMerge "Bluetooth HID Device: format code, fix docstring, hide unplug()"
Treehugger Robot [Thu, 7 Dec 2017 21:37:45 +0000 (21:37 +0000)]
Merge "Bluetooth HID Device: format code, fix docstring, hide unplug()"

6 years agoBT: Remove dead code in BluetoothHeadset
Jack He [Thu, 7 Dec 2017 20:06:21 +0000 (12:06 -0800)]
BT: Remove dead code in BluetoothHeadset

The following hidden API methods are not implemented by the stack and
should be removed:
 - getBatteryUsageHint()
 - acceptIncomingConnect()
 - rejectIncomingConnect()

The following hidden API methods are no longer needed due to lack of
usage and should be removed:
 - enableWBS()
 - disableWBS()
 - bindResponse()

Bug: 70336991
Test: make
Change-Id: I75bd6735573e4cbc61b5bef8722b8badac2e9170

6 years agoMerge "Use correct user id for permission check for instant foreground service"
Svetoslav Ganov [Thu, 7 Dec 2017 17:43:52 +0000 (17:43 +0000)]
Merge "Use correct user id for permission check for instant foreground service"

6 years agoMerge changes from topic "predicates_aosp"
Jeff Sharkey [Thu, 7 Dec 2017 16:39:39 +0000 (16:39 +0000)]
Merge changes from topic "predicates_aosp"

* changes:
  Deeper sanity checking of emitted types.
  Emit all APIs using Predicates.
  Massage APIs for upcoming doclava change.

6 years agoMerge "fix system app's abi error after uninstall updated version."
Treehugger Robot [Thu, 7 Dec 2017 14:53:04 +0000 (14:53 +0000)]
Merge "fix system app's abi error after uninstall updated version."

6 years agoMerge "Fix doc typo. Improve class javadoc..."
Neil Fuller [Thu, 7 Dec 2017 11:02:52 +0000 (11:02 +0000)]
Merge "Fix doc typo. Improve class javadoc..."

6 years agoFix available/remaining PIN/PUK attempts.
Ruthwar Kumar Ambeer [Thu, 9 Mar 2017 13:16:17 +0000 (18:46 +0530)]
Fix available/remaining PIN/PUK attempts.

* Fix to properly display attempts remaining for PIN/PUK.
* On bootup show the available PIN/PUK attempts if sim
is locked on PIN/PUK.
* Show incorrect password message on entering wrong PIN/PUK
password.

In KeyGuardSimPinView and KeyGuardSimPukView, check for sim locked on
PIN and reset the flags to show the default message.

Bug: 37782683
Change-Id: I46d7d5dd86977cddecf3147add73ef6ccc64b257

6 years agoSend empty LinkProperties when entering StoppedState.
Erik Kline [Wed, 6 Dec 2017 04:37:09 +0000 (13:37 +0900)]
Send empty LinkProperties when entering StoppedState.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - changing from DHCPv4 to static while continuously pinging the
      default gateway works jsut fine
    - dumpsys log shows that during the change we send the empty LP:
  12-06 08:46:51.085 - CMD_ON_QUIT wlan0/23 0 0 null [rcvd_in=StoppingState, proc_in=StoppingState]
  12-06 08:46:51.092 - INVOKE onLinkPropertiesChange({{InterfaceName: wlan0 LinkAddresses: []  Routes: [] DnsAddresses: [] Domains: null MTU: 0}})

Bug: 69800563
Change-Id: I01047e9a72fce718a167c592bf14406c3bab3ba9

6 years agoMerge "Disable AVB check in runtime vintf"
Treehugger Robot [Thu, 7 Dec 2017 08:15:35 +0000 (08:15 +0000)]
Merge "Disable AVB check in runtime vintf"

6 years agoUse correct user id for permission check for instant foreground service
Svet Ganov [Thu, 7 Dec 2017 07:45:38 +0000 (23:45 -0800)]
Use correct user id for permission check for instant foreground service

Test: cts-tradefed run cts-dev -m CtsAppSecurityHostTestCases
          -t android.appsecurity.cts.EphemeralTest#testStartForegrondService

bug:68275646

Change-Id: I196522c49ae8a7e0ec07bf631f04bae51e96db5b

6 years agofix system app's abi error after uninstall updated version.
liulvping [Mon, 6 Nov 2017 09:36:40 +0000 (17:36 +0800)]
fix system app's abi error after uninstall updated version.

When uninstall an updated system app, we always did as
following steps. First we delete data structure by calling
deleteInstalledPackageLIF(), then enable it from disabled
system packages and re-adding to PackageSettings map by
calling addPackageLPw(). At last re-installing apps in
system partition with scanPackageTracedLI().

But if an package with sharedUserId readded failed with
exception of 'Adding duplicate shared id: xxx', then we
cann't reuse it's derived CPU Abis from settings, others
we could get CPU Abis uninitialized errors.

Test: Manual; Update an system app with sharedUserId
Test: Manual; Uninstall and ensure it run ok

Change-Id: Icfda17c5004d291c664ed80d578aca4b7cf4a975
Signed-off-by: liulvping <liulvping@xiaomi.com>
6 years agoDeeper sanity checking of emitted types.
Jeff Sharkey [Thu, 7 Dec 2017 04:12:23 +0000 (21:12 -0700)]
Deeper sanity checking of emitted types.

When emitting a method or field, verify that we're able to reference
all mentioned types.  This ensures that we don't accidentally
reference undefined classes/interfaces.

Test: manual inspection of API files
Bug: 69791141
Change-Id: I84e0c87fe83daa118661f61dbdf17b58ea5282d4
Merged-In: I84e0c87fe83daa118661f61dbdf17b58ea5282d4

6 years agoEmit all APIs using Predicates.
Jeff Sharkey [Thu, 7 Dec 2017 04:02:11 +0000 (21:02 -0700)]
Emit all APIs using Predicates.

Generate APIs using updated doclava.

Test: manual inspection of API text files
Bug: 69505783
Change-Id: I2efd22998a64ebb57588b073c4a591242f4aef91
Merged-In: I2efd22998a64ebb57588b073c4a591242f4aef91

6 years agoMassage APIs for upcoming doclava change.
Jeff Sharkey [Thu, 7 Dec 2017 03:53:38 +0000 (20:53 -0700)]
Massage APIs for upcoming doclava change.

These changes are needed to ensure that "checkapi" doesn't claim
that we're changing the API after an upcoming doclava change.

Test: manual inspection of API text files
Bug: 69505783
Change-Id: I8292ba80cc65b7dd78f0e9dba4fcc7ffcedfab9c
Merged-In: I8292ba80cc65b7dd78f0e9dba4fcc7ffcedfab9c

6 years agoMerge "Revert "Add odm sepolicy support to SELinuxMMAC.java""
Treehugger Robot [Thu, 7 Dec 2017 04:02:29 +0000 (04:02 +0000)]
Merge "Revert "Add odm sepolicy support to SELinuxMMAC.java""

6 years agoBluetooth HID Device: format code, fix docstring, hide unplug()
Hansong Zhang [Mon, 4 Dec 2017 18:31:30 +0000 (10:31 -0800)]
Bluetooth HID Device: format code, fix docstring, hide unplug()

* Reformat code with google-java-format
* Add the note that When an application is registered, the HID Host service
will be disabled until it is unregistered
* Fix the links in docstring
* Add @hide to unplug(); this is not a public API

Bug: 63384609
Test: make
Change-Id: I5dfcaab58b02c19e5745461c16602064a0ad8b83

6 years agoRevert "Add odm sepolicy support to SELinuxMMAC.java"
Bo Hu [Wed, 6 Dec 2017 22:17:32 +0000 (22:17 +0000)]
Revert "Add odm sepolicy support to SELinuxMMAC.java"

This reverts commit fffa6d238a31ac5e7b30a6e1d852c8c2cc22af1d.

Reason for revert: broke mac build

b/70273082

FAILED: out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil
/bin/bash -c "(out/host/darwin-x86/bin/version_policy -b out/target/product/generic_x86/obj/FAKE/selinux_policy_intermediates/plat_pub_policy.cil -t out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_policy_raw.cil -n 10000.0 -o out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil.tmp ) && (grep -Fxv -f out/target/product/generic_x86/obj/ETC/plat_pub_versioned.cil_intermediates/plat_pub_versioned.cil out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil.tmp > out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil ) && (out/host/darwin-x86/bin/secilc -m -M true -G -N -c 30  out/target/product/generic_x86/obj/ETC/plat_sepolicy.cil_intermediates/plat_sepolicy.cil out/target/product/generic_x86/obj/ETC/plat_pub_versioned.cil_intermediates/plat_pub_versioned.cil out/target/product/generic_x86/obj/ETC/10000.0.cil_intermediates/10000.0.cil out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil -o /dev/null -f /dev/null )"
Parsing out/target/product/generic_x86/obj/FAKE/selinux_policy_intermediates/plat_pub_policy.cil
Parsing out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_policy_raw.cil
grep: out of memory

Change-Id: I186f7bc68a76d7b2d717875791ee2fe1828c3598

6 years agoRemove empty ScopedArray constructor.
Seigo Nonaka [Wed, 6 Dec 2017 18:00:20 +0000 (10:00 -0800)]
Remove empty ScopedArray constructor.

Bug: N/A
Test: m checkbuild
Change-Id: I70b8ed3b7a152f1469ff81af962766a8edfcea6b

6 years agoMerge "DO NOT MERGE: Merge Oreo MR1 into master"
Xin Li [Wed, 6 Dec 2017 23:18:26 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"

6 years agoDO NOT MERGE: Merge Oreo MR1 into master
Xin Li [Wed, 6 Dec 2017 19:51:59 +0000 (11:51 -0800)]
DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I727a014df2fb05a4b13cb67b1fcb760a8b387523

6 years agoMerge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)"
Treehugger Robot [Wed, 6 Dec 2017 19:34:22 +0000 (19:34 +0000)]
Merge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)"

6 years agoMerge "Auto-format BluetoothManagerService.java"
Treehugger Robot [Wed, 6 Dec 2017 19:22:44 +0000 (19:22 +0000)]
Merge "Auto-format BluetoothManagerService.java"

6 years agoMerge "Auto-format BluetoothAdapter.java"
Treehugger Robot [Wed, 6 Dec 2017 19:22:38 +0000 (19:22 +0000)]
Merge "Auto-format BluetoothAdapter.java"

6 years agoAuto-format BluetoothManagerService.java
Myles Watson [Tue, 28 Nov 2017 00:42:11 +0000 (16:42 -0800)]
Auto-format BluetoothManagerService.java

Test: build
Change-Id: If97c454a8e5aff34c4f8550f7ade3da413a200b7

6 years agoAuto-format BluetoothAdapter.java
Myles Watson [Tue, 28 Nov 2017 00:41:47 +0000 (16:41 -0800)]
Auto-format BluetoothAdapter.java

Test: build
Change-Id: I7bfc729373a24cceee05e443195640ff7f6d43b9

6 years agoMerge "SystemUI: Display RAT icon in quick setting when data is off"
Wenting Xiong [Wed, 6 Dec 2017 16:21:34 +0000 (16:21 +0000)]
Merge "SystemUI: Display RAT icon in quick setting when data is off"
am: f845bbdfa4

Change-Id: I3285f1f9e63cbf3d0487618b5ff636c7637ef9e4

6 years agoMerge "SystemUI: Display RAT icon in quick setting when data is off"
Treehugger Robot [Wed, 6 Dec 2017 16:07:28 +0000 (16:07 +0000)]
Merge "SystemUI: Display RAT icon in quick setting when data is off"

6 years agoIMS: Add support for STK CC feature
Suresh Koleti [Sat, 29 Jul 2017 04:46:43 +0000 (10:16 +0530)]
IMS: Add support for STK CC feature

-- Add interface in IImsUtListener to get data for
   UNSOL_ON_SS.
-- Add new file ImsSsData to store the data received
   as part of UNSOL_ON_SS.
-- Add approprate error codes and strings to support
   to show error dialogs to user.
-- Add ImsUtInterface API's to indicate UNSOL_ON_SS
   to ImsPhoneCallTracker.

Test: Manual
Bug: 64685331
Change-Id: I023c1af0d521e5b19ecce1576c4caa299ae468e3

6 years agoMerge "Add odm sepolicy support to SELinuxMMAC.java"
kaichieh [Wed, 6 Dec 2017 10:11:10 +0000 (10:11 +0000)]
Merge "Add odm sepolicy support to SELinuxMMAC.java"
am: a0c52a8ace

Change-Id: I5cc7ab8916901e1b3622a17676debe023578f1eb

6 years agoMerge "Add odm sepolicy support to SELinuxMMAC.java"
Treehugger Robot [Wed, 6 Dec 2017 10:00:46 +0000 (10:00 +0000)]
Merge "Add odm sepolicy support to SELinuxMMAC.java"

6 years agoMerge "Cleanup of resource limit tests"
ludi [Wed, 6 Dec 2017 03:29:35 +0000 (03:29 +0000)]
Merge "Cleanup of resource limit tests"
am: 39f58678db

Change-Id: Ifcbc61ad8003c43ba1baff6d4d534192f6498206

6 years agoMerge "Support scanDirectories with JNI callback function"
kyle_tso [Wed, 6 Dec 2017 03:22:30 +0000 (03:22 +0000)]
Merge "Support scanDirectories with JNI callback function"
am: 5747c2b81c

Change-Id: I8996fb568c4024ccf76a5643049de8cee6f811c6

6 years agoMerge "Don't remove bonding device from cached device list during inquiry"
Venkata Jagadeesh [Wed, 6 Dec 2017 03:17:29 +0000 (03:17 +0000)]
Merge "Don't remove bonding device from cached device list during inquiry"
am: d5410ca51b

Change-Id: Ibef0191ee1863e08ab73226d9e27cbdfa54face2

6 years agoMerge "Use -Werror in frameworks/base/tests/backup"
Chih-hung Hsieh [Wed, 6 Dec 2017 03:12:09 +0000 (03:12 +0000)]
Merge "Use -Werror in frameworks/base/tests/backup"
am: d5dca64f72

Change-Id: Ic05b86f4bbff44e03298e823e9105c664b7ba1e0

6 years agoMerge "Cleanup of resource limit tests"
Treehugger Robot [Wed, 6 Dec 2017 02:58:41 +0000 (02:58 +0000)]
Merge "Cleanup of resource limit tests"

6 years agoMerge "Support scanDirectories with JNI callback function"
Treehugger Robot [Wed, 6 Dec 2017 02:06:49 +0000 (02:06 +0000)]
Merge "Support scanDirectories with JNI callback function"

6 years agoMerge "Don't remove bonding device from cached device list during inquiry"
Treehugger Robot [Wed, 6 Dec 2017 00:48:40 +0000 (00:48 +0000)]
Merge "Don't remove bonding device from cached device list during inquiry"

6 years agoMerge "Use -Werror in frameworks/base/tests/backup"
Chih-hung Hsieh [Wed, 6 Dec 2017 00:25:20 +0000 (00:25 +0000)]
Merge "Use -Werror in frameworks/base/tests/backup"

6 years agoDon't remove bonding device from cached device list during inquiry
Venkata Jagadeesh [Fri, 20 May 2016 07:38:35 +0000 (13:08 +0530)]
Don't remove bonding device from cached device list during inquiry

Use case: DUT unable to start auto connect after pairing to remote devices

Steps:
1. pair with remote device
2. unpair remote device.
3. Pair again to same remote from available devices list and initiate inquiry same time

Failure: DUT unable to start auto connect after pairing to remote device

Root Cause: As bonding device is removed from cached device list,a new cached device
entry is created after bonding with auto connection variable reset.

Fix: This issue fixed by deleting only non bonded and non bonding devices during inquiry.

Test: Tested with Beats Wireless

Bug: 35415106

Change-Id: I9d1c399292420fa2e321a4f6410e672a2abcc423

6 years agoSystemUI: Display RAT icon in quick setting when data is off
Wenting Xiong [Tue, 5 Dec 2017 05:16:34 +0000 (13:16 +0800)]
SystemUI: Display RAT icon in quick setting when data is off

Introduce implementation to display RAT icon in quick setting
even when data is off.

Test: Test with simulated RIL
Bug: 28805511
Change-Id: I7fabec993c22e3359e36cff2caca9258d79f6273

6 years agoUse -Werror in frameworks/base/tests/backup
Chih-Hung Hsieh [Tue, 5 Dec 2017 17:56:46 +0000 (09:56 -0800)]
Use -Werror in frameworks/base/tests/backup

* Ommit unused parameter names.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: Ie073fd911480960673b24d5b4d84b4f8dd0d0302

6 years agoMerge "Fix bug in MacAddress.fromString()"
Hugo Benichi [Tue, 5 Dec 2017 09:47:50 +0000 (09:47 +0000)]
Merge "Fix bug in MacAddress.fromString()"
am: cdb84d2fc7

Change-Id: If4c85f0a5ea259f53f9cffa6eacb58fcde1fd1df

6 years agoMerge "Fix bug in MacAddress.fromString()"
Treehugger Robot [Tue, 5 Dec 2017 09:38:42 +0000 (09:38 +0000)]
Merge "Fix bug in MacAddress.fromString()"

6 years agoMerge "Don't use path to find protoc-gen-javastream"
Colin Cross [Tue, 5 Dec 2017 05:33:47 +0000 (05:33 +0000)]
Merge "Don't use path to find protoc-gen-javastream"
am: 1a2a45667b

Change-Id: Idf4e12d812cf9108f8c3b22057e0bcbd90c14807

6 years agoMerge "Don't use path to find protoc-gen-javastream"
Treehugger Robot [Tue, 5 Dec 2017 05:22:25 +0000 (05:22 +0000)]
Merge "Don't use path to find protoc-gen-javastream"

6 years agoFix bug in MacAddress.fromString()
Hugo Benichi [Tue, 5 Dec 2017 04:14:08 +0000 (13:14 +0900)]
Fix bug in MacAddress.fromString()

Test: runtest frameworks-net
Bug: 69390696
Change-Id: I83f01e4915092e08ed201d9b6738bb02498d3bba

6 years agoMerge "Frameworks: Silently ignore InterruptedException"
Andreas Gampe [Tue, 5 Dec 2017 02:34:41 +0000 (02:34 +0000)]
Merge "Frameworks: Silently ignore InterruptedException"
am: 7e717e09cd

Change-Id: I75da071918e7fc2e547df4e4d75121806c730ca2

6 years agoMerge "Validate IpSecAlgorithm Length"
nharold [Tue, 5 Dec 2017 02:28:10 +0000 (02:28 +0000)]
Merge "Validate IpSecAlgorithm Length"
am: 68b81299d2

Change-Id: I23f7612c119e67f9a1647568aeefde38a365f8da

6 years agoMerge "Frameworks: Silently ignore InterruptedException"
Treehugger Robot [Tue, 5 Dec 2017 02:25:14 +0000 (02:25 +0000)]
Merge "Frameworks: Silently ignore InterruptedException"

6 years agoMerge "Validate IpSecAlgorithm Length"
nharold [Tue, 5 Dec 2017 02:13:55 +0000 (02:13 +0000)]
Merge "Validate IpSecAlgorithm Length"

6 years agoMerge "Fix droiddoc when OUT_DIR is an absolute path"
Colin Cross [Tue, 5 Dec 2017 01:29:12 +0000 (01:29 +0000)]
Merge "Fix droiddoc when OUT_DIR is an absolute path"
am: 85f095e246

Change-Id: I5a91ba906958777944fc25fb5de281e4c8beebe7

6 years agoMerge "Match network roaming state to avoid wtf()."
Jeff Sharkey [Tue, 5 Dec 2017 01:11:53 +0000 (01:11 +0000)]
Merge "Match network roaming state to avoid wtf()."
am: 3fb2711ede

Change-Id: I6796d37e4458ef4da16d16f4c0f2bdd495007515

6 years agoDon't use path to find protoc-gen-javastream
Colin Cross [Tue, 5 Dec 2017 00:02:10 +0000 (16:02 -0800)]
Don't use path to find protoc-gen-javastream

Previous attempts to use a full path in the --plugin argument
failed, but that was because the --plugin argument had the wrong
name (protoc-gen-java-stream instead of protoc-gen-javastream)
and was being completely ignored.  Passing a full path where
the last element of the path is protoc-gen-javastream works fine.

Fixes issues where the command line is expanded with $PATH in
it 58 times which could hit command length limits if $PATH was
even a little bit larger than the default.

Test: m framework
Change-Id: Icd336f522fb8770d9058d18d8a04d24a96405615

6 years agoMerge "Fix droiddoc when OUT_DIR is an absolute path"
Colin Cross [Tue, 5 Dec 2017 01:08:41 +0000 (01:08 +0000)]
Merge "Fix droiddoc when OUT_DIR is an absolute path"

6 years agoFix droiddoc when OUT_DIR is an absolute path
Colin Cross [Mon, 4 Dec 2017 21:45:19 +0000 (13:45 -0800)]
Fix droiddoc when OUT_DIR is an absolute path

The droiddoc rules were passing the sources in through
LOCAL_SRC_FILES, which gets prefixed with $(LOCAL_PATH).  They
were prefixing ../.. to try to counter frameworks/base in
$(LOCAL_PATH), but that doesn't work for absolute paths to
generated files in an absolute $(OUT_DIR).

Use $(LOCAL_GENERATED_SOURCES) for anything that is in $(OUT_DIR)
instead, which takes paths that are relative to the top of the tree
or absolute.

Bug: 70166718
Test: m OUT_DIR=/tmp/out docs
Change-Id: I93b743607c2b8ce05512ecd4bbe860747cb48428
Merged-In: I93b743607c2b8ce05512ecd4bbe860747cb48428
(cherry-picked from commit bd200ce7d4ebe31ad4327683e59af269420b0ef5)

6 years agoMerge "Match network roaming state to avoid wtf()."
Jeff Sharkey [Tue, 5 Dec 2017 00:58:46 +0000 (00:58 +0000)]
Merge "Match network roaming state to avoid wtf()."

6 years agoMerge "Remove unused AIDL files"
Colin Cross [Tue, 5 Dec 2017 00:06:29 +0000 (00:06 +0000)]
Merge "Remove unused AIDL files"
am: d0abc863f4

Change-Id: Ia6d798f6acf3930945cac488db81ccec3792648d

6 years agoMerge "Make it possible to hide signal strength via Carrier Config"
Jordan Liu [Mon, 4 Dec 2017 23:44:36 +0000 (23:44 +0000)]
Merge "Make it possible to hide signal strength via Carrier Config"
am: febd180254

Change-Id: Iff2bf2fa0132692b3164d5543cfd20cd1d153ede

6 years agoMerge "MacAddress: light refactors and improve documentation"
Hugo Benichi [Mon, 4 Dec 2017 23:38:27 +0000 (23:38 +0000)]
Merge "MacAddress: light refactors and improve documentation"
am: d871cab32d

Change-Id: I51bb8786ecd7f53e3342625c7a2625007eedfc0f

6 years agoMerge "Remove unused AIDL files"
Treehugger Robot [Mon, 4 Dec 2017 23:35:35 +0000 (23:35 +0000)]
Merge "Remove unused AIDL files"

6 years agoMerge "Make it possible to hide signal strength via Carrier Config"
Jordan Liu [Mon, 4 Dec 2017 23:20:31 +0000 (23:20 +0000)]
Merge "Make it possible to hide signal strength via Carrier Config"

6 years agoValidate IpSecAlgorithm Length
Nathan Harold [Fri, 10 Nov 2017 00:49:33 +0000 (16:49 -0800)]
Validate IpSecAlgorithm Length

Improve the Validation of IpSecAlgorithm by
explicitly checking the length in addition to
the truncation length (previously an oversight).
In addition, we now check the lengths during
un-parceling, which will catch someone maliciously
manually building a parcel and passing it, bypassing
the checks in the constructor.

Bug: 68780091
Test: runtest -x IpSecAlgorithmTest.java
Change-Id: I8172762617264d34f47d5144336464510f07a701