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

279067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Pavlin Radoslavov
7d14914239 Merge "Integration of the LDAC codec for A2DP source" am: 3c050268f0 
am: bb8f1cd92b

Change-Id: I62f8462330d7661b8008abf862c4d4bb47c129dc
 2017-01-05 07:55:27 +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
Treehugger Robot
3c050268f0 Merge "Integration of the LDAC codec for A2DP source" 2017-01-05 07:43:50 +00:00
Pavlin Radoslavov
fad8b730d2 Integration of the LDAC codec for A2DP source 
The codec can be used if the encoding shared library is installed
on the device:
 libldacBT_enc.so

Test: A2DP streaming to LDAC headsets
Bug: 30958229

Change-Id: I524805fd308b5181427515617eda05625a7c4ae5
 2017-01-04 18:07:29 -08:00
Pavlin Radoslavov
5aaa985e97 Merge "Integration of the aptX and aptX-HD codecs for A2DP source" am: 5242acbd0b 
am: a750c90ac1

Change-Id: I7957fb151bb113485240fdc2bae1cdd380930f27
 2017-01-05 02:07:05 +00:00
Pavlin Radoslavov
a750c90ac1 Merge "Integration of the aptX and aptX-HD codecs for A2DP source" 
am: 5242acbd0b

Change-Id: I4007f4e68e889ed0a41ac5fc035f175e3709bb0d
 2017-01-05 02:02:01 +00:00
Treehugger Robot
5242acbd0b Merge "Integration of the aptX and aptX-HD codecs for A2DP source" 2017-01-05 01:56:35 +00:00
Pavlin Radoslavov
feeb9b245c Integration of the aptX and aptX-HD codecs for A2DP source 
Each of the codecs can be used if the corresponding encoding
shared library is installed on the device:
 - aptX: libaptX.so
 - aptX-HD: libaptXHD.so

Test: A2DP streaming to aptX and aptX-HD headsets
Bug: 30958229
Change-Id: I24faddc8cd88ae3e1370922c633f30e13124a867
 2017-01-04 16:30:35 -08:00
Jeremy Joslin
195ac87578 Merge "Defining a new REQUEST_NETWORK_SCORES permission." am: a54d76a81f 
am: 84fd1e1120

Change-Id: I85279a0185d9191bf81e1088d68f86827fe2d103
 2017-01-04 23:16:38 +00:00
Jeremy Joslin
84fd1e1120 Merge "Defining a new REQUEST_NETWORK_SCORES permission." 
am: a54d76a81f

Change-Id: I4fc03585c4943712f5c1309a5bfa2995dac1bbe0
 2017-01-04 23:10:42 +00:00
Julius D'souza
d559cb8124 Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev 
am: b60eb1a854

Change-Id: I09803955b09d3dec66bca8e4fed6f21fe18aa7d6
 2017-01-04 23:05:48 +00:00
Julius D'souza
54a0faa37b DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. 
am: bbfdf7ad23

Change-Id: Iafc7d24b276db9b145709e7af80e03292c1ce735
 2017-01-04 23:05:42 +00:00
Treehugger Robot
a54d76a81f Merge "Defining a new REQUEST_NETWORK_SCORES permission." 2017-01-04 23:04:47 +00:00
Julius D'souza
b60eb1a854 Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev 2017-01-04 23:00:00 +00:00
Jeremy Joslin
b68823cab8 Merge "Fix NetworkScoreServiceTest.testSystemRunning." am: 5b4aec1dc6 
am: 01828eb244

Change-Id: I094906527e9baf20f6bcb844f261d0fdcb8f6aa6
 2017-01-04 22:58:52 +00:00