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

277262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Przemyslaw Szczepaniak
44cc1f23bf Merge "Track libcore/jsr-166 update" 
am: f6f36d7d9a

Change-Id: I6ba30b86fa45403631233ede5994eac0748d9b37
 2017-01-09 11:17:06 +00:00
Przemyslaw Szczepaniak
f6f36d7d9a Merge "Track libcore/jsr-166 update" 2017-01-09 11:08:35 +00:00
Przemyslaw Szczepaniak
9e63cc2a08 Track libcore/jsr-166 update 
No functional changes.

Update after the switch from custom to openJdk-based implementation of
java.util.concurrent.CopyOnWriteArrayList class.
Tracks libcore commit 29957558cf0db700bfaae360a80c42dc3871d0e5.

Test: make -j 32
Bug: 30860904
Change-Id: I4435bc1fb5ef9fc4ee5f882370073ba8ce2bcfba
 2017-01-09 10:49:49 +00:00
Nick Kralevich
12b387dd87 Merge "Dumps total size of primary storage." 
am: 55dc66dde4

Change-Id: Ifc3537d3aeda5e6eb3b1c003a4eaf392d07bcf86
 2017-01-08 15:00:18 +00:00
Nick Kralevich
55dc66dde4 Merge "Dumps total size of primary storage." 2017-01-08 14:53:09 +00:00
Peter Qiu
fdbc827a52 Merge "wifi: hotspot2: Passpoint configuration APIs update" 
am: b1c9bc5ea5

Change-Id: I47d8e12fbb7bc3faefabbed02b7235396eb6dbe5
 2017-01-08 07:00:57 +00:00
Treehugger Robot
b1c9bc5ea5 Merge "wifi: hotspot2: Passpoint configuration APIs update" 2017-01-08 06:51:52 +00:00
Felipe Leme
c0d3f0ed52
Dumps total size of primary storage. 
BUG: 32069168
Test: manual verification

(cherry picked from commit 281389ac5475e483d10a2e8aa31195b9e9875246)

Change-Id: If5dee52a99c03a00dada22736c09d953dc0b66d1
 2017-01-08 03:51:37 +01:00
Etan Cohen
dce01e235b Merge "[AWARE] Remove reason from discovery session terminate callback" 
am: bbbe5e6ccd

Change-Id: Iede092421659c5ae55475f153d940d97dac6b7b0
 2017-01-07 20:13:33 +00:00
Etan Cohen
bbbe5e6ccd Merge "[AWARE] Remove reason from discovery session terminate callback" 2017-01-07 20:05:38 +00:00
Etan Cohen
fd23421472 Merge "[AWARE] Simplify Wi-Fi Aware API namespace" 
am: 834a87d525

Change-Id: I243194a658ee8e9c5a21301601a473149eaa8a2f
 2017-01-07 18:20:31 +00:00
Etan Cohen
834a87d525 Merge "[AWARE] Simplify Wi-Fi Aware API namespace" 2017-01-07 18:12:33 +00:00
Alex Naidis
fd55f834c8 Merge "DefaultPermissionGrantPolicy: Pass correct arguments" 
am: 0b325c6634

Change-Id: I5d217037bececb7a096ccfa018fafaa4280e4537
 2017-01-07 01:40:42 +00:00
Treehugger Robot
0b325c6634 Merge "DefaultPermissionGrantPolicy: Pass correct arguments" 2017-01-07 01:33:18 +00:00
Pavlin Radoslavov
d190040dd1 Merge "Add Bluetooth Codec selection UI to the Developer Options" 
am: bfd7f9a1f8

Change-Id: I0cc5f64f292a56e6301b294974c1bd3cc72664c0
 2017-01-07 01:25:34 +00:00
Treehugger Robot
bfd7f9a1f8 Merge "Add Bluetooth Codec selection UI to the Developer Options" 2017-01-07 01:19:33 +00: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
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
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
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
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
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
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
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
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
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
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
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
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
Pavlin Radoslavov
bb8f1cd92b Merge "Integration of the LDAC codec for A2DP source" 
am: 3c050268f0

Change-Id: I79092dfa7a6918bf359b266bec7a7bbc736f08ce
 2017-01-05 07:49:49 +00:00
Martijn Coenen
52280c38e2 Callback elision for HIDL interfaces. 
Test: mma, hidl_test_java
Bug: 31380743
Change-Id: I9a5c8ef0cc6ac3150395a867690ca82ec2bc419f
 2017-01-05 08:48:15 +01:00