drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
279,133 Commits 1 Branch 0 Tags
Commit Graph

279133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
bfd7f9a1f8 Merge "Add Bluetooth Codec selection UI to the Developer Options" 2017-01-07 01:19:33 +00:00
Dave Friedman
2a3ebadcbe Docs: Updates Javadoc documentation. 
Bug: 32532540

Change-Id: Ia811d9a51812206b18b75a98f6c5a55b92627404
 2017-01-06 16:41:19 -08:00
Etan Cohen
b84ad8062d [AWARE] Remove reason from discovery session terminate callback 
Only valid reason is per request (destroy or timeout/count).

Bug: 32670068
Test: unit tests & integration tests (sl4a) passing
Change-Id: I85d417442e26a16d7f09d6d2d4cbb8ae7a9eba7e
 2017-01-06 16:07:41 -08:00
Etan Cohen
3de35a5e55 [AWARE] Simplify Wi-Fi Aware API namespace 
Simplify Wi-fi Aware API namespace. Rely on project and remove WifiAware
prefix from most classes.

(pure rename operation: no functional changes)

Bug: 31470256
Test: unit-tests + integration (sl4a) tests.
Change-Id: I38b8137c1730c8f40c482c6770caafcaeafd5c46
 2017-01-06 16:06:42 -08:00
Pavlin Radoslavov
60d704f841 Add Bluetooth Codec selection UI to the Developer Options 
Test: A2DP streaming to headsets and manual UI interaction
Bug: 30958229
Change-Id: I88f6efedf1c89b524c863543135ef7be9b7e1a7c
 2017-01-06 15:44:27 -08:00
Alex Naidis
f030a28a6b DefaultPermissionGrantPolicy: Pass correct arguments 
After parsing the xml files in the "default-permissions"
system, we are passing the arguments in the wrong order.

The method we are targeting is:
private void grantRuntimePermissionsLPw(PackageParser.Package pkg, Set<String> permissions,
            boolean systemFixed, boolean isDefaultPhoneOrSms, int userId) {

However we are passing our argument for "systemFixed"
to "isDefaultPhoneOrSms" and the other way around too.

This patch fixes it by using the version of the method
which takes 4 arguments and sets "isDefaultPhoneOrSms"
as false.

Change-Id: I3604a5d6045aadcd91b6dd3f6f1b47b561403b23
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
 2017-01-06 22:21:24 +00:00
Peter Qiu
90eb89ed06 wifi: hotspot2: Passpoint configuration APIs update 
- renamed addPasspointConfiguration to addOrUpdatePasspointConfiguration
  to match the implementation of the API
- updated getPasspointConfigurations to return an empty list instead of
  a null when no configuration is installled

Bug: 33587910
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Id40185edb08910c01454c44b77957e2d5c0df722
 2017-01-06 14:06:52 -08:00
Dan Albert
22f0b9d1ae Merge "Unversion NDK stub libraries." am: ddc7ac8ba6 
am: e2b4d4a38a

Change-Id: I57440577773e47f60e6af4e9112523b78741f9fa
 2017-01-06 21:03:24 +00:00
Dan Albert
e2b4d4a38a Merge "Unversion NDK stub libraries." 
am: ddc7ac8ba6

Change-Id: I0cf382ae983796b948acfe84e1bb9b639de86a65
 2017-01-06 20:54:52 +00:00
Treehugger Robot
ddc7ac8ba6 Merge "Unversion NDK stub libraries." 2017-01-06 20:44:19 +00:00
Dan Albert
98e462df7d Unversion NDK stub libraries. 
The system versions of these libraries aren't versioned yet.

Bug: https://github.com/android-ndk/ndk/issues/278
Test: make ndk
Change-Id: I74e988be8f60f8728a0bfa7360091cbd9f5b1186
 2017-01-06 11:04:14 -08:00
Ruchi Kandoi
c1db6c05d0 Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b 
am: 388980d88f

Change-Id: I8d5498492cae8ffe9048422720427855eaad5ca8
 2017-01-06 19:03:07 +00:00
Ruchi Kandoi
388980d88f Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." 
am: cc4203221b

Change-Id: I4add3ce1cf3170aff887865302964b4425094692
 2017-01-06 18:58:17 +00:00
Ruchi Kandoi
cc4203221b Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." 2017-01-06 18:49:45 +00:00
Ruchi Kandoi
104e0b4399 nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings. 
Bug: 32881476
Test: Manual; backup, change settings, restore

Change-Id: Ibc31b23f632c50a2c7120734fc96e7d855df062e
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
 2017-01-06 18:48:51 +00:00
Alain Vongsouvanh
e51a76861c bools: fix use_lock_pattern_drawable javadoc. 
am: c4046b5542

Change-Id: I381d005e73d6100e619dabf607b27cb18a969d7f
 2017-01-06 17:41:43 +00:00
TreeHugger Robot
414f8fbdbb Merge "resolve merge conflicts of 2fda2ce15958 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp 2017-01-06 10:40:36 +00:00
Yohann Roussel
1c0070aa5d Merge "Fix LOCAL_SDK_VERSION of 3 multidex apks" am: 43c98c74fe 
am: ef5d1cb3b4

Change-Id: Ia2f1b08cf63b6543be1e50786ba9090ffedc1431
 2017-01-06 09:42:44 +00:00
Yohann Roussel
ef5d1cb3b4 Merge "Fix LOCAL_SDK_VERSION of 3 multidex apks" 
am: 43c98c74fe

Change-Id: I8475d98d4d4eaf3801c9c13570f36a10c525daa3
 2017-01-06 09:38:33 +00:00
Yohann Roussel
43c98c74fe Merge "Fix LOCAL_SDK_VERSION of 3 multidex apks" 2017-01-06 09:29:26 +00:00
Alain Vongsouvanh
c4046b5542 bools: fix use_lock_pattern_drawable javadoc. 
Change-Id: If135544edb499ee64117bf81c6e3d0eebbfcff00
 2017-01-05 22:54:07 -08:00
Ajay Panicker
e0211af867 Merge "Prevent LocalSocket from creating an fd if fd is already there" am: 616910fd53 
am: d76576b6d1

Change-Id: I0b59b10a095bf23d4f26856690bf6be2a5304cbc
 2017-01-06 01:46:10 +00:00
Ajay Panicker
d76576b6d1 Merge "Prevent LocalSocket from creating an fd if fd is already there" 
am: 616910fd53

Change-Id: I90192dd7e656b9bec62815ad628fc4e67f806240
 2017-01-06 01:41:09 +00:00
Treehugger Robot
616910fd53 Merge "Prevent LocalSocket from creating an fd if fd is already there" 2017-01-06 01:29:47 +00:00
Steven Moreland
94924f38fb Merge "HwBinder: get/register checked exceptions." am: 9ec4fec5ca 
am: 3290ba072b

Change-Id: I49ee88cca2b2da0eac8d73cf408d2c5bfb409ce9
 2017-01-06 01:09:26 +00:00
Steven Moreland
3290ba072b Merge "HwBinder: get/register checked exceptions." 
am: 9ec4fec5ca

Change-Id: Id6abc10992428af2e55cb5228c298b69c111c621
 2017-01-06 01:05:02 +00:00
Treehugger Robot
9ec4fec5ca Merge "HwBinder: get/register checked exceptions." 2017-01-06 00:58:17 +00:00
Evgenii Stepanov
97e98f18b7 Merge "Fix stack-buffer-overflow detected by AddressSanitizer." am: 1d8995aa9c 
am: bd38f6f4f8

Change-Id: Id28b9734e27b62f2eb642a4193482e9026f8f3b7
 2017-01-06 00:29:29 +00:00
Evgenii Stepanov
bd38f6f4f8 Merge "Fix stack-buffer-overflow detected by AddressSanitizer." 
am: 1d8995aa9c

Change-Id: I65a468b94b1bc927bb4cff8b08a08dc6a8aca09e
 2017-01-06 00:25:28 +00:00
Treehugger Robot
1d8995aa9c Merge "Fix stack-buffer-overflow detected by AddressSanitizer." 2017-01-06 00:17:00 +00:00
Amin Shaikh
d7f371813a Merge "Fix NetworkScorerAppManager#isCallerActiveScorer." am: 48eecdcbc4 
am: 7495cf633c

Change-Id: Ie6913526fbc1b0ae63eb7c0c7be7d9eac5772f50
 2017-01-06 00:15:01 +00:00
Amin Shaikh
7495cf633c Merge "Fix NetworkScorerAppManager#isCallerActiveScorer." 
am: 48eecdcbc4

Change-Id: I6b9ecd35dbc0758cd45b804dc9586287428af293
 2017-01-06 00:08:19 +00:00
Treehugger Robot
48eecdcbc4 Merge "Fix NetworkScorerAppManager#isCallerActiveScorer." 2017-01-05 23:57:54 +00:00
Ajay Panicker
7a8c36aa4e Prevent LocalSocket from creating an fd if fd is already there 
Any LocalSocket created with a FileDescriptor will throw IOExceptions
when performing most opperations due to the fact that the LocalSocket
tries to create an implementation but fails since there is a FileDescriptor
already set.

Bug: 34095140
Test: Setup using tap&go
Change-Id: Ie8f50def6156c16617697d939d6c0ab570281642
 2017-01-05 23:52:30 +00:00
Alain Vongsouvanh
5549258eea resolve merge conflicts of 2fda2ce15958 to nyc-mr1-dev-plus-aosp 
Change-Id: Ia35164bd4ea262fa72afb7b78a47b0e4f0ef96ba
 2017-01-05 15:27:37 -08:00
Amin Shaikh
2cd918a63e Fix NetworkScorerAppManager#isCallerActiveScorer. 
The current implementation checks whether the caller's uid has the
SCORE_NETWORKS permission instead of checking the passed in callingUid. I
removed this check entirely because the getActiveScorer method already checks
whether the scorer's package has the SCORE_NETWORKS permission. There is no way
callingUid can equal the active scoring package's uid without also having the
SCORE_NETWORKS permission.

Bug: 34107721
Test: runtest --path core/tests/coretests/src/android/net/NetworkScorerAppManagerTest.java
Change-Id: Ifd427792169837c84a10a76b208c76137db06ae9
 2017-01-05 14:28:47 -08:00
Xin Li
2cb75e822d Merge "Use half-width quotes in code example." am: 1fe99a819c 
am: 161d1487ba

Change-Id: Ia4814baf438c72d4ceed3be864e391513ed1c78e
 2017-01-05 21:57:48 +00:00
Xin Li
161d1487ba Merge "Use half-width quotes in code example." 
am: 1fe99a819c

Change-Id: I28a34f7813268d7a9303029d257996d6ceb53269
 2017-01-05 21:51:13 +00:00
Treehugger Robot
1fe99a819c Merge "Use half-width quotes in code example." 2017-01-05 21:39:06 +00:00
Evgenii Stepanov
ab622718f3 Fix stack-buffer-overflow detected by AddressSanitizer. 
Bug: 31855186
Test: boot SANITIZE_TARGET=address build
Change-Id: I5c2c64564ccea28e416d66b27af9d86506d622ce
 2017-01-05 13:03:07 -08:00
Xin Li
5c14ebbbfa Use half-width quotes in code example. 
Test: m -j49 -k docs
BUG: 34106216
Change-Id: I366b0bf085ad3fd166b7961301bb8c35da6a7630
 2017-01-05 11:49:43 -08:00
Mark Renouf
9b32a35aa7 Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN 
In some cases (e.g. Android Wear) SystemWindowInsets can be non-zero
due to overscan layout hints even when no SystemUI is present.

This change resepects the overscan flag on input method windows
allowing an IME to opt-out of the navigation bar guard and receive
full-height content view.

BUG: 32700226
Change-Id: Ic38f204a892bf34e8dae65990d5aa8c95af555d8
 2017-01-05 13:52:59 -05:00
Steven Moreland
c0631d0bb7 HwBinder: get/register checked exceptions. 
Bug: 33673120
Test: hidl_test_java
Change-Id: Id19b61b252e756a032ae11f7b59bd8eed82edbe9
 2017-01-05 09:20:44 -08:00
Alain Vongsouvanh
2fda2ce159 widget: Adding support for custom LockPatternView. 
OEMs can overlay the default 9 dots by providing two drawables that represent
those dots:
  * lockscreen_notselected: asset to display when a cell has not been selected.
  * lockscreen_selected: asset to display when a cell has been selected.

BUG: 33755663
Change-Id: Ic595b01f5e1321696b7a3feb0ff73c1acccfb942
 2017-01-05 16:16:49 +00:00
Martijn Coenen
e358f83640 Merge "Callback elision for HIDL interfaces." am: 33bd8a97b3 
am: 4369507dcb

Change-Id: Ic9ea53f3b7cff0d656b6147ca6d159b75df0bdda
 2017-01-05 09:52:32 +00:00
Martijn Coenen
4369507dcb Merge "Callback elision for HIDL interfaces." 
am: 33bd8a97b3

Change-Id: Ic001e0d9a9c946cf9be38a55b2e0ec61b4931cf4
 2017-01-05 09:47:45 +00:00
Martijn Coenen
33bd8a97b3 Merge "Callback elision for HIDL interfaces." 2017-01-05 09:40:57 +00:00
Robert Sesek
2c3818158a Merge "Synchronize access to WebViewZygote." am: fd6f631de5 
am: c8111e07d0

Change-Id: I8c389a9c06bd0b8d1964756323e6c7e010901f89
 2017-01-05 09:37:32 +00:00
Robert Sesek
c8111e07d0 Merge "Synchronize access to WebViewZygote." 
am: fd6f631de5

Change-Id: I20eaaf40b2ed060caf3685f229005c3e78f29d19
 2017-01-05 09:31:24 +00:00
Treehugger Robot
fd6f631de5 Merge "Synchronize access to WebViewZygote." 2017-01-05 09:21:00 +00:00