Commit Graph

62646 Commits

Author SHA1 Message Date
songjinshi
36bcc913f7 Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85
am: ec69bd0aa3

Change-Id: Idfe455733dd12bf82c31cb505681e4fa89d57bfb
2017-02-08 20:22:26 +00:00
songjinshi
ec69bd0aa3 Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile."
am: b6f7a85b85

Change-Id: Iea79127b2c7d823844406f677a98fea54043f4cb
2017-02-08 20:18:13 +00:00
Treehugger Robot
b6f7a85b85 Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." 2017-02-08 20:11:23 +00:00
Paul Duffin
9250814fd2 Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am: 78a20be77a
am: 9e99b9ee45

Change-Id: I289950cff0cdc6b5ad301936c7b55eadee5fd0f8
2017-02-08 18:30:17 +00:00
Paul Duffin
9e99b9ee45 Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
am: 78a20be77a

Change-Id: I6f32dc27f70e4c22d25ec6bd2eec715700ebbd89
2017-02-08 18:14:50 +00:00
songjinshi
e02e3ea7f9 [Debug]: Add timeout for dumpNativeBacktraceToFile.
If the debuggerd be blocked, the watchdog and
activitymanager thread will be blocked when the
ANR or watchdog occurs,so we needed to add
timeout for dumpNativeBacktraceToFile.

Change-Id: Iab1a64328e70257025d860638d93a4fb8eaaeea2
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
2017-02-07 19:17:45 +00:00
Paul Duffin
3e5fbca0c5 Replace com.android.internal.util.Predicate with java.util.function.Predicate
Bug: 35089332
Bug: 30188076
Test: make checkbuild
Merged-In: I0a5b4bf520fc39b59d8d790b01e9cff0d54e6d21
Change-Id: I58e4e35e7b7315033d893748f7c79e1ba6732f39
2017-02-07 16:57:54 +00:00
Pavlin Radoslavov
b7067e2b6c Merge "Add a mechanism to configure the default A2DP codec priorities" am: acf34d8b62
am: cd6e0ee19d

Change-Id: I6fb8a3a35451cf2d1e228466ef4a4d4e89d1d4ca
2017-02-07 00:10:21 +00:00
Pavlin Radoslavov
cd6e0ee19d Merge "Add a mechanism to configure the default A2DP codec priorities"
am: acf34d8b62

Change-Id: I8a97b344bb09f4bded076ea81875b3b78dc50bea
2017-02-06 23:12:23 +00:00
Pavlin Radoslavov
2199339c39 Add a mechanism to configure the default A2DP codec priorities
Previously, the relative codec priorities were hard-codec internally.
The new mechanism uses the following configurable resources in
packages/apps/Bluetooth/res/values/config.xml to re-assign the
default codec priorities per device, or to explicitly disable a codec.

 - a2dp_source_codec_priority_sbc
 - a2dp_source_codec_priority_aac
 - a2dp_source_codec_priority_aptx
 - a2dp_source_codec_priority_aptx_hd
 - a2dp_source_codec_priority_ldac

Those values are assigned on startup.
Also, they can be changed per device by using an overlay:
device/<VENDOR>/<DEVICE>/overlay/packages/apps/Bluetooth/res/values/config.xml

Test: Manually streaming to a headset
Change-Id: Ic4da3a51ac73f00cbae731156cb7878c8fadee06
2017-02-06 13:07:23 -08:00
Aga Madurska
9e7a8688c1 Use correct APIs to detect conditions for round scrollbars.
am: 99485ef841

Change-Id: I8aaa6bf17e253f6178b96c6743ff7779d5f3b7ef
2017-02-06 19:37:04 +00:00
Pavel Grafov
5a474b4930 Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31
am: fca679ff74

Change-Id: Ic6e2aab590583c501fa74317ee614ab1ebaea378
2017-02-06 17:46:11 +00:00
Pavel Grafov
fca679ff74 Fix the documentation for SecurityLog.SecurityEvent.getData().
am: 739cda8f31

Change-Id: I0c6f1271392bfc9cc8d253d5fa5e029213492b48
2017-02-06 17:41:08 +00:00
Jason Monk
a8e10e5f20 Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" am: ff1d8da55e
am: 74a8b6543f

Change-Id: If195ccf536a45ef21e8ee70547ea76e26732c583
2017-02-06 15:47:39 +00:00
Jason Monk
74a8b6543f Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent"
am: ff1d8da55e

Change-Id: I173b94730ae02f3e9b0638aac9f43972b59e10f3
2017-02-06 15:43:04 +00:00
Aga Madurska
99485ef841 Use correct APIs to detect conditions for round scrollbars.
Bug: 34876394

Test: Performed manually.

Change-Id: I9e690e99fd8d925c589ebd19d9c6754eeb63b1d8
2017-02-06 12:33:36 +00:00
Akira Oshimi
8d2e9a9b30 Add tile information to ACTION_QS_TILE_PREFERENCES intent
One application can provide two or more custom Quick Settings tiles.
But there is no way to know which tile is long-pressed from application
side because ACTION_QS_TILE_PREFERENCES intent that is sent when
long-pressed doesn't have any additional information. So the component
name and state of the tile should be added to the intent.

Bug: 34832801
Test: manual - long press a custom tile

Change-Id: Iaa884cd944f19a2f007cbde645e8f8b1198bffb7
2017-02-06 04:45:13 +00:00
Paul Lawrence
e6e8c7a1dd Install seccomp into zygote not init am: ef85477470
am: 521d25294b

Change-Id: I7c2c84a5bd67490070777d11d7f930c5dba90cbe
2017-02-02 18:30:49 +00:00
Paul Lawrence
521d25294b Install seccomp into zygote not init
am: ef85477470

Change-Id: I22745a759cc4f9797cb3c806bbdd4d69d6cccdcb
2017-02-02 18:18:08 +00:00
Paul Lawrence
ef85477470 Install seccomp into zygote not init
Bug: 34710876
Test: Boots, correct size filter installed, blocks unallowed calls

Change-Id: I3e66e8724ace37f7d30451b98a5e574766252ea0
2017-02-02 17:45:11 +00:00
Pavel Grafov
739cda8f31 Fix the documentation for SecurityLog.SecurityEvent.getData().
If the payload contains more than one object, it is passed in Object[].

Change-Id: I28ca2ec35d920c644bdea13f15b2787ef3170310
Fixes: 34871284
Test: Read aloud, sounds good.
2017-02-02 12:47:53 +00:00
Erik Kline
7196e935a8 Merge "Add ConnectivityManager.networkCapabilitiesForType()" am: c313123afe
am: 6f32aa0259

Change-Id: I6828bc3bb094ca8597ca2d8538045758638c374f
2017-02-02 07:27:13 +00:00
Erik Kline
6f32aa0259 Merge "Add ConnectivityManager.networkCapabilitiesForType()"
am: c313123afe

Change-Id: I0ad50fbf38f11b383fd889dc598cfddd47051477
2017-02-02 07:22:05 +00:00
Erik Kline
35bf06c968 Add ConnectivityManager.networkCapabilitiesForType()
This static method returns a NetworkCapabilities instance with
transports and capabilities set according to the given legacy type.

Also:
    - add NetworkRequest.Builder.setCapabilities(), to be able to use
      the NetworkCapabilities instances returned from the above
    - update UpstreamNetworkMonitor to make immediate use of this

Test: as follows
    - build (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - WiFi to DUN upstream tethering works
Bug: 32163131

Change-Id: Idfe1ddd2815c355cbf27cf29eb0e3de177de84e9
2017-02-02 11:07:59 +09:00
Brad Ebinger
fa1dca0ad6 Merge "Adds @hide permission granting API for ImsServices" am: 390ec27f9d
am: 6734275c2f

Change-Id: I6d502db3362aafcfed426b6598be0bd39dd38890
2017-02-01 19:35:56 +00:00
Brad Ebinger
6734275c2f Merge "Adds @hide permission granting API for ImsServices"
am: 390ec27f9d

Change-Id: I0f3d38811925884681d11cf18e12f1b0574d64c6
2017-02-01 19:30:41 +00:00
Treehugger Robot
390ec27f9d Merge "Adds @hide permission granting API for ImsServices" 2017-02-01 19:24:11 +00:00
Jeremy Joslin
31669e8924 Merge "Post runnables instead of sending messages." am: 71317f4a6c
am: 71a4792147

Change-Id: Idff8f071f316942e8b520c913e96d3eb8b44227d
2017-02-01 01:40:58 +00:00
Jeremy Joslin
71a4792147 Merge "Post runnables instead of sending messages."
am: 71317f4a6c

Change-Id: I13cb1fd38262f869b99245678c89f45b834210c8
2017-02-01 01:34:16 +00:00
Treehugger Robot
71317f4a6c Merge "Post runnables instead of sending messages." 2017-02-01 01:26:05 +00:00
Jeremy Joslin
c695a17421 Post runnables instead of sending messages.
Gaining access to a Handler's Looper can be problematic in custom
Handler implementations. Instead of creating a new internal Handler
to dispatch the method calls on we simply post Runnables to the
given Handler.

Test: adb shell am instrument -e class android.net.NetworkRecommendationProviderTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Bug: 34845471
Change-Id: I6fe380a92aebd630781abe5853f94737bcfeaa5f
2017-01-31 11:51:25 -08:00
Pavlin Radoslavov
91707989c4 Merge "Update the A2DP Codec Config API" am: ccd60f7cbe
am: f0096fb868

Change-Id: Ibc7d4b500adc4451978f366557b93dc6b6d3da63
2017-01-31 19:13:05 +00:00
Pavlin Radoslavov
f0096fb868 Merge "Update the A2DP Codec Config API"
am: ccd60f7cbe

Change-Id: Idc54b85eb096ec0116395332c7bc0b543a59a7d5
2017-01-31 19:07:58 +00:00
Pavlin Radoslavov
b37f181c98 Update the A2DP Codec Config API
Previously, the JNI upcall would contain only the current codec config.
In the new API, the upcall contains:
 1. The current codec config
 2. The list of codecs containing the local codecs capabilities
 3. The list of codecs containing the selectable codecs capabilities.
    This list is the intersection of the local codecs capabilities
    and the capabilities of the paired device.

Also, refactored the Java internals to accomodate the extra information:
 * Added new class BluetoothCodecStatus that contains the extra info:
   current codec config, local codecs capabilities and selectable
   codecs capabilities
 * Renamed method getCodecConfig() to getCodecStatus() and return the
   corresponding BluetoothCodecStatus object.
 * Updates to class BluetoothCodecConfig:
   new methods isValid(), getCodecName(), and updated toString()
   so it is more user friendly
 * Removed BluetoothCodecConfig.EXTRA_CODEC_CONFIG and
   EXTRA_PREVIOUS_CODEC_CONFIG.
   The former is superseded by BluetoothCodecStatus.EXTRA_CODEC_STATUS;
   the latter is not really used.

Test: A2DP streaming with headsets and switching the codecs
Change-Id: Ia1af2c22e521e863e28a360610aca49f7e62d31b
2017-01-31 18:58:27 +00:00
Brad Ebinger
f477979bf9 Adds @hide permission granting API for ImsServices
Adds the @hide API to grant ImsServices default permissions
using the PackageManager and DefaultPermissionGrantPolicy APIs.

Test: Manual
Bug: 32460405
Change-Id: Ia143ede42623b4c2203261fc6e83624d73c478f1
2017-01-30 13:12:09 -08:00
Marie Janssen
ca312c1cd3 Merge "Bluetooth: add getDiscoveryEndMillis() call" am: 1785fc4eea
am: 7f8d8638eb

Change-Id: I6f02c4ddc0fe56cda5af2dcf2f5193ba13522792
2017-01-30 17:57:02 +00:00
Marie Janssen
7f8d8638eb Merge "Bluetooth: add getDiscoveryEndMillis() call"
am: 1785fc4eea

Change-Id: Iecb0aaeae57b473c8679c492717fd7c6daad82ac
2017-01-30 17:51:37 +00:00
Marie Janssen
1785fc4eea Merge "Bluetooth: add getDiscoveryEndMillis() call" 2017-01-30 17:46:18 +00:00
Nicolas Geoffray
1852c380e0 Merge "Introduce DEBUG_JAVA_DEBUGGABLE." am: 4df43ad959
am: 27ffe754a4

Change-Id: I24d3eed3d6172fdff79a74945ecadea7b0d76590
2017-01-30 15:21:17 +00:00
Nicolas Geoffray
27ffe754a4 Merge "Introduce DEBUG_JAVA_DEBUGGABLE."
am: 4df43ad959

Change-Id: Iebecb5b77d07bf91820044eda8923b2b30ebfe60
2017-01-30 15:15:10 +00:00
Nicolas Geoffray
4df43ad959 Merge "Introduce DEBUG_JAVA_DEBUGGABLE." 2017-01-30 15:09:45 +00:00
Marie Janssen
23a4833157 Bluetooth: add getDiscoveryEndMillis() call
Method to tell when the adapter finished (or will finish) being in
discovery mode.

Test: compiles and still can scan
Bug: 34395439
Change-Id: I41b48c2b934c0a1d5e1727cec08f3f762e3cb309
2017-01-27 18:48:11 -08:00
John Reck
3c2837e77e Merge "Fix a bunch of repeated reads of a ro.* property" am: 4265991701
am: e4c2e8f303

Change-Id: Id6af451556fde8eefac8076735e625911f8bf272
2017-01-27 23:02:41 +00:00
John Reck
e4c2e8f303 Merge "Fix a bunch of repeated reads of a ro.* property"
am: 4265991701

Change-Id: I996fbd1002ef788a768b575ab6d2177dc9ab5af1
2017-01-27 22:57:29 +00:00
Treehugger Robot
4265991701 Merge "Fix a bunch of repeated reads of a ro.* property" 2017-01-27 22:49:04 +00:00
Nicolas Geoffray
347b1df988 Introduce DEBUG_JAVA_DEBUGGABLE.
For notifying ART it will run a debuggable app.

Also rename ENABLE_DEBUGGER to ENABLE_JDWP.

Test: builds and runs
bug: 28769520
Change-Id: Ic096a176edfd5bf0bbe92b8367fbaa687a07d284
2017-01-27 11:26:53 -08:00
John Reck
ed065024a5 Fix a bunch of repeated reads of a ro.* property
SystemProperties.get() is not particularly fast,
especially if a string is returned. Since ro.* values
are unable to be changed, there's no need to
continously re-query them. Cache the value at
static init time to trivially fix this.

Test: refactoring CL.
Change-Id: Iccb021d3cb2ba3a4a1d0048ddec6811bb7409eec
(cherry picked from commit aa67f684ff)
2017-01-27 11:04:39 -08:00
Shukang Zhou
221e58fe95 Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling." am: e924640c4b
am: b0f03a64ea

Change-Id: I35fa80e43cd4f6af76099848714f838f217b7989
2017-01-27 19:01:44 +00:00
Shukang Zhou
b0f03a64ea Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling."
am: e924640c4b

Change-Id: I7e56dd815f5ac72b27ac6e2e2ca7614eaa648db1
2017-01-27 18:57:12 +00:00
Treehugger Robot
e924640c4b Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling." 2017-01-27 18:49:45 +00:00