Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Guy
5a9b2ed1ea Merge "Set accessibility string for suspended widgets." into nyc-dev am: 7b4b2fbc0a 
am: 7185fc8cc3

* commit '7185fc8cc3266ad713a4f19791dec5b7a06e57e0':
  Set accessibility string for suspended widgets.

Change-Id: Ice17a4983d11a49d260ca6082f85d03908694e5f
 2016-05-24 13:27:01 +00:00
Kenny Guy
91dfd02233 Merge "Set accessibility string for suspended widgets." into nyc-dev am: 7b4b2fbc0a 
am: d7d4203050

* commit 'd7d420305094d8e267c8fc3cee5ab2252bf1280c':
  Set accessibility string for suspended widgets.

Change-Id: I26a41681436009fb1fc6fc57c102539be0096687
 2016-05-24 13:26:56 +00:00
Kenny Guy
d7d4203050 Merge "Set accessibility string for suspended widgets." into nyc-dev 
am: 7b4b2fbc0a

* commit '7b4b2fbc0afd9cff3d4bb647b0ed7dc79ab747dc':
  Set accessibility string for suspended widgets.

Change-Id: Idc35229ca5da9b460c0b806b3833196d66c48499
 2016-05-24 13:20:31 +00:00
Kenny Guy
7185fc8cc3 Merge "Set accessibility string for suspended widgets." into nyc-dev 
am: 7b4b2fbc0a

* commit '7b4b2fbc0afd9cff3d4bb647b0ed7dc79ab747dc':
  Set accessibility string for suspended widgets.

Change-Id: Iedafb99a35224a37e816c510284ebfc01fe3c87d
 2016-05-24 13:20:25 +00:00
Kenny Guy
7b4b2fbc0a Merge "Set accessibility string for suspended widgets." into nyc-dev 2016-05-24 13:11:12 +00:00
Mahaver Chopra
4545f9138e Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev 
am: dd86aa141e

* commit 'dd86aa141e02ffaf277996fc1701141ea13e090e':
  Disallow OEM unlock when DISALLOW_FACTORY_RESET applies

Change-Id: I077fd5c067c453a4dcd161ba582e473ade1a8392
 2016-05-24 12:30:44 +00:00
Mahaver Chopra
dd86aa141e Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev 2016-05-24 12:22:51 +00:00
Sergio Giro
f076687f67 Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" am: 393b67d65f am: 163f8a2e91 
am: d767eba969

* commit 'd767eba969531b2df1ed41d82dac0853dce67cce':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: I78cfc9155ab1ab43b4c8280f57f877b551882b9b
 2016-05-24 12:18:31 +00:00
Sergio Giro
d767eba969 Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" am: 393b67d65f 
am: 163f8a2e91

* commit '163f8a2e9132b60f86f28a352ded1db6a38d367e':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: Ibb6a051e31bb52c246be990fe79495f1f7252b9f
 2016-05-24 12:14:18 +00:00
Sergio Giro
163f8a2e91 Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" 
am: 393b67d65f

* commit '393b67d65fdbf4565cbec2f40fcabaaf87143dfd':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: Idc8e1ca4ae2160285fe56995290c241c3a7288f2
 2016-05-24 12:06:25 +00:00
Mahaver Chopra
830e32cdcc Disallow OEM unlock when DISALLOW_FACTORY_RESET applies 
Bug: 28339424
Change-Id: I4b6dc6f186ea60a13e778f52d574e615b0b19b74
 2016-05-24 12:03:40 +00:00
Sergio Giro
393b67d65f Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" 2016-05-24 11:56:50 +00:00
Gustav Sennton
c4446568cc resolve merge conflicts of 00b735a to master 
Change-Id: Ief4ed37cf8de3e2d4279a1267717dd6a54702b7c
 2016-05-24 12:54:11 +01:00
Android Build Merger (Role)
880cec0d48 Merge "Merge "Load WebView even if WebView relro creation times out." into nyc-dev am: a2fbfbce9e am: a44129dd55" into nyc-mr1-dev-plus-aosp 2016-05-24 10:51:38 +00:00
Gustav Sennton
6fcbaee0f4 Merge "Load WebView even if WebView relro creation times out." into nyc-dev am: a2fbfbce9e 
am: a44129dd55

* commit 'a44129dd5518c1890f2301baea7e03972408e270':
  Load WebView even if WebView relro creation times out.

Change-Id: I5f0a0df8a08eafcfa10d63597c9ce8af3496c900
 2016-05-24 10:51:01 +00:00
Gustav Sennton
00b735a310 Merge "Load WebView even if WebView relro creation times out." into nyc-dev am: a2fbfbce9e 
am: 930ad20ef4

* commit '930ad20ef492a02994ad8efec9821c0fb46e5ba2':
  Load WebView even if WebView relro creation times out.

Change-Id: I043822e0eb95fb540d68a903ed87855c1340f70b
 2016-05-24 10:50:56 +00:00
Gustav Sennton
930ad20ef4 Merge "Load WebView even if WebView relro creation times out." into nyc-dev 
am: a2fbfbce9e

* commit 'a2fbfbce9ef09ed7a98222e67709aa086e548c79':
  Load WebView even if WebView relro creation times out.

Change-Id: Iae015c9bc199836db71553cbbcea7d8842eb8dda
 2016-05-24 10:46:29 +00:00
Gustav Sennton
a44129dd55 Merge "Load WebView even if WebView relro creation times out." into nyc-dev 
am: a2fbfbce9e

* commit 'a2fbfbce9ef09ed7a98222e67709aa086e548c79':
  Load WebView even if WebView relro creation times out.

Change-Id: Icf6e99e3f3dfc9b1f4244f5da63e32b3d741459c
 2016-05-24 10:46:16 +00:00
Gustav Sennton
a2fbfbce9e Merge "Load WebView even if WebView relro creation times out." into nyc-dev 2016-05-24 10:39:32 +00:00
Toby Sargeant
450d664e90 Merge "Refactor ZygoteInit to support a WebView-specific zygote." 2016-05-24 08:45:04 +00:00
Robert Carr
e9953b1752 Force pending transactions to flush before screenshot. 
Following 14e54ba747 (ag/1043009) we need to push an empty
synchronous transaction if we want to ensure all previous
transactions have occured before taking a screenshot. In
light of Bug 7552304 it seems wise to do this before screenshoting
applications.

Bug: 27098060
Bug: 7552304
Change-Id: I6d7dfbe634a288c55449d2f1d6fbbfc13bab08ad
 2016-05-23 20:57:11 -07:00
Lorenzo Colitti
5c30d4ca1d Merge "Merge "Support IPv6 multicast filtering in APF." into nyc-dev am: d954c6368f am: 09a2690f91" into nyc-mr1-dev-plus-aosp 
am: f067d4def0

* commit 'f067d4def0be988884881644ac33168570beee8f':

Change-Id: I3ad2451e58d4aba8f47172c4342b06e6fc170b83
 2016-05-24 03:27:12 +00:00
Lorenzo Colitti
3c94cc1970 Merge "Support IPv6 multicast filtering in APF." into nyc-dev am: d954c6368f am: 50282f0cb7 
am: 19665ab032

* commit '19665ab032d5ea5355175719a90a9e90d28e15ea':
  Support IPv6 multicast filtering in APF.

Change-Id: I7c77efb518a7343fb8b7e1fb9f5246903e4860c5
 2016-05-24 03:27:07 +00:00
Android Build Merger (Role)
f067d4def0 Merge "Merge "Support IPv6 multicast filtering in APF." into nyc-dev am: d954c6368f am: 09a2690f91" into nyc-mr1-dev-plus-aosp 2016-05-24 03:22:45 +00:00
Lorenzo Colitti
192ce86fa8 Merge "Support IPv6 multicast filtering in APF." into nyc-dev am: d954c6368f 
am: 09a2690f91

* commit '09a2690f91b32a6be57d92ced7e13ee6b683ed24':
  Support IPv6 multicast filtering in APF.

Change-Id: I68e937bbeab2285528b5fed7a298daaf5500f924
 2016-05-24 03:22:15 +00:00
Lorenzo Colitti
19665ab032 Merge "Support IPv6 multicast filtering in APF." into nyc-dev am: d954c6368f 
am: 50282f0cb7

* commit '50282f0cb7bbdd117cb31db3b127adb0f4f196a0':
  Support IPv6 multicast filtering in APF.

Change-Id: I58cb62ff0bb5304d614b8eb61da148c6a5d94bed
 2016-05-24 03:22:11 +00:00
Lorenzo Colitti
50282f0cb7 Merge "Support IPv6 multicast filtering in APF." into nyc-dev 
am: d954c6368f

* commit 'd954c6368fc6e591385e608fa6ebb42dc7606074':
  Support IPv6 multicast filtering in APF.

Change-Id: I99641c19b2b0014d313e281070d5888a3759588f
 2016-05-24 03:19:32 +00:00
Lorenzo Colitti
09a2690f91 Merge "Support IPv6 multicast filtering in APF." into nyc-dev 
am: d954c6368f

* commit 'd954c6368fc6e591385e608fa6ebb42dc7606074':
  Support IPv6 multicast filtering in APF.

Change-Id: I6123c2390aa9641652fd200adcc16f9724799aab
 2016-05-24 03:19:29 +00:00
Lorenzo Colitti
d954c6368f Merge "Support IPv6 multicast filtering in APF." into nyc-dev 2016-05-24 03:14:38 +00:00
Pavlin Radoslavov
bc7a4b088c Merge "Reduced the impact of "synchronized" statements am: eb50a39e98 am: c6a3503100" into nyc-mr1-dev-plus-aosp 
am: b235a96091

* commit 'b235a96091983e139cdc8ff73147ff7aa291bea4':

Change-Id: Ica7b123553d2cec7c74cceed0526f019db718233
 2016-05-24 02:43:05 +00:00
Pavlin Radoslavov
ad791cf956 Reduced the impact of "synchronized" statements am: eb50a39e98 am: 13b1a15db0 
am: 813d5bd9b3

* commit '813d5bd9b36642a06618995fa3d116b9c79b0d6f':
  Reduced the impact of "synchronized" statements

Change-Id: Ib2fa9a53a234418308b07f61d7f3d1eaa61898f6
 2016-05-24 02:41:51 +00:00
Android Build Merger (Role)
b235a96091 Merge "Reduced the impact of "synchronized" statements am: eb50a39e98 am: c6a3503100" into nyc-mr1-dev-plus-aosp 2016-05-24 02:39:31 +00:00
Pavlin Radoslavov
7d9da8cd9c Reduced the impact of "synchronized" statements am: eb50a39e98 
am: c6a3503100

* commit 'c6a35031005c24eaa2e6592218d3e653ff623668':
  Reduced the impact of "synchronized" statements

Change-Id: I87af74e9dd74f18cac98144763a866a847bbfe21
 2016-05-24 02:38:31 +00:00
Pavlin Radoslavov
813d5bd9b3 Reduced the impact of "synchronized" statements am: eb50a39e98 
am: 13b1a15db0

* commit '13b1a15db07b2187b8a134f54e574e2c6a76dadc':
  Reduced the impact of "synchronized" statements

Change-Id: I84d731281a7424a6d9fe4ae633f47a97a0446aa7
 2016-05-24 02:38:29 +00:00
Suprabh Shukla
d9814a2f14 Merge "Adding RetailModeService to handle retail mode" into nyc-mr1-dev am: a09c9e0fc4 
am: 99a233ac8a

* commit '99a233ac8a949481e74a93d2288a4ffbaaae9a6e':
  Adding RetailModeService to handle retail mode

Change-Id: Ic97ceacb0719a5f33dc025101df7cf458e99df96
 2016-05-24 02:35:56 +00:00
Pavlin Radoslavov
13b1a15db0 Reduced the impact of "synchronized" statements 
am: eb50a39e98

* commit 'eb50a39e98acb78d16465041bb5c172aa1637e97':
  Reduced the impact of "synchronized" statements

Change-Id: I60a4b0e656b283f83c49c3c0211943b4854867e0
 2016-05-24 02:34:28 +00:00
Pavlin Radoslavov
c6a3503100 Reduced the impact of "synchronized" statements 
am: eb50a39e98

* commit 'eb50a39e98acb78d16465041bb5c172aa1637e97':
  Reduced the impact of "synchronized" statements

Change-Id: I272dba69e9011720356a3c5b9ca849de281f5027
 2016-05-24 02:34:23 +00:00
Suprabh Shukla
99a233ac8a Merge "Adding RetailModeService to handle retail mode" into nyc-mr1-dev 
am: a09c9e0fc4

* commit 'a09c9e0fc48816096349aac8960a3b49101d90a3':
  Adding RetailModeService to handle retail mode

Change-Id: I8ac04712c319eeb4ff8087ea828331bdb0450867
 2016-05-24 02:31:46 +00:00
TreeHugger Robot
a09c9e0fc4 Merge "Adding RetailModeService to handle retail mode" into nyc-mr1-dev 2016-05-24 02:24:50 +00:00
Doris Liu
9f3b31b953 Improve the property modification effiency of VectorDrawable animators 
Previously, the VectorDrawable animators modify the VD properties by
doing reflection based on the property name. This CL avoids the overhead
of calling reflection by wrapping the setters of VD objects in
Float/IntProperty.

Bug: 28124049
Change-Id: I562c8d749fdfe508564c82a700a92e835cdd9ff4
 2016-05-23 18:33:24 -07:00
Etan Cohen
a258918133 [NAN] Add retry count for transmitting L2 NAN messages 
am: 93d3c79b54

* commit '93d3c79b54cbc913ff013102a408c6d330d6e73a':
  [NAN] Add retry count for transmitting L2 NAN messages

Change-Id: I429fb24a0b4b260009efe3ac7ea641577d1ac8b4
 2016-05-24 01:28:04 +00:00
Pavlin Radoslavov
eb50a39e98 Reduced the impact of "synchronized" statements 
* Removed "synchronized" statements that are not needed
* Replaced "synchronized" statements with Read/Write lock as
 appropriate. The lock protects the access to and the setting of
 BluetoothAdapter.mService and BluetoothManagerService.mBluetooth and
 associated state.

Bug: 28734075
Bug: 28799467
Change-Id: I8f8281c505f0a1ae0add1e14a3caba1f5b2a98e4
 2016-05-24 01:17:29 +00:00
Suprabh Shukla
cc30b0e790 Adding RetailModeService to handle retail mode 
The service listens for the global setting DEVICE_DEMO_MODE and switches
device to demo mode when it is changed to 1. Also, acquires the wakelock
to
keep the screen on and puts up a notification to wipe and reset the demo
session when in demo mode.

Bug: 27280140
Change-Id: If1843016889ec2c50818c67432d60f33063e0986
 2016-05-23 17:47:51 -07:00
Dianne Hackborn
a9298bbc70 Merge "Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev am: 9c252700f6 am: f7003f512f 
am: a521fe5c97

* commit 'a521fe5c97d5d0c93efaebd588314c3a605ad09c':

Change-Id: Ic22deae70526a9b5f9d1305f441357b78dcc8886
 2016-05-24 00:47:13 +00:00
Dianne Hackborn
4debcd04a1 Merge "PIP: Handle configuration changes" into nyc-dev am: 75822138ad am: 74ebf3ec67 
am: c21fa8c3f6

* commit 'c21fa8c3f62f0fff8145a3512554b4b432104db4':
  Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x

Change-Id: Ie07d802b416a0b6a04777dc762d5968b93fa1a2c
 2016-05-24 00:39:39 +00:00
Jaewan Kim
60c061ece5 Merge "Merge "PIP: Handle configuration changes" into nyc-dev am: 75822138ad am: 938c4e3564" into nyc-mr1-dev-plus-aosp 
am: 36cd971997

* commit '36cd971997afd50c2708bac09ed1ac34bb873a37':

Change-Id: Icaeaf8427b4007643e3877ede856a6bc36e741c2
 2016-05-24 00:39:36 +00:00
Jaewan Kim
2d3982688f Merge "PIP: Handle configuration changes" into nyc-dev am: 75822138ad am: b917a0e6be 
am: 9a6f0098ba

* commit '9a6f0098bad37bc058b392bfcdeeffb09059e800':
  PIP: Handle configuration changes

Change-Id: I88feb7b888cab473abe5319858b7a03028199d9d
 2016-05-24 00:39:28 +00:00
Dianne Hackborn
a521fe5c97 Merge "Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev am: 9c252700f6 
am: f7003f512f

* commit 'f7003f512f055614c1e297c9c19192a68cbf6794':

Change-Id: Ie93c870ac3c79820e1dc59aad08956fc159bf9c8
 2016-05-24 00:39:23 +00:00
Mitchell Wills
c5baad0250 Rename TetherInterfaceSM to TetherInterfaceStateMachine 
Change-Id: I324690b20f37cef6d58872e21b126a87d16f7ec8
 2016-05-23 17:37:32 -07:00
Eric Laurent
219de73da2 Fix AudioTrack and AudioRecord documentation 
Improve documentation for error codes returned by
AudioTrack.write() and AudioRecord.read() methods.
Fix native to JAVA error code conversion in JNI.

Bug: 28906466

Change-Id: I4d48b1d428834b7a39a14e2d81b6c164696817a8
 2016-05-23 17:36:43 -07:00