Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,895 Commits 3 Branches 0 Tags
87f3aeeee2a9859cd312c3f1d8a18946cf8f582b
Commit Graph

256895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
Jaewan Kim
c21fa8c3f6 Merge "PIP: Handle configuration changes" into nyc-dev am: 75822138ad 
am: 74ebf3ec67

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

Change-Id: I6c01fb9689735a6214bd9f3b29d4dd50a8744388
 2016-05-24 00:35:36 +00:00
Android Build Merger (Role)
36cd971997 Merge "Merge "PIP: Handle configuration changes" into nyc-dev am: 75822138ad am: 938c4e3564" into nyc-mr1-dev-plus-aosp 2016-05-24 00:31:07 +00:00
Jaewan Kim
9a6f0098ba Merge "PIP: Handle configuration changes" into nyc-dev am: 75822138ad 
am: b917a0e6be

* commit 'b917a0e6be841d23ff56c54b03abb42b3a93d930':
  PIP: Handle configuration changes

Change-Id: I018fc45368eff5fbe9ba5d6f21b00d616e622010
 2016-05-24 00:30:38 +00:00
Dianne Hackborn
74ebf3ec67 Merge "Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev 
am: 9c252700f6

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

Change-Id: Ib2811fb49299da93459066d9d6312d403681eed4
 2016-05-24 00:30:32 +00:00
Jaewan Kim
201f814231 Merge "PIP: Handle configuration changes" into nyc-dev am: 75822138ad 
am: 938c4e3564

* commit '938c4e356417360e161dcf7a9eba2524f13373f0':
  PIP: Handle configuration changes

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

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

Change-Id: I9f3aa6eedbf66eceee0fcaed95a862bea656e359
 2016-05-24 00:30:30 +00:00
Hang Yin
3ed27cc2b2 Created 4 camera preview stress test cases. 
The 4 stress test cases cover situations of preview switch between
front/back camera and between photo/video mode. Followed Google
Camera App Kenai version streaming rules to set preview request in
the tests.

b/28916141 will be solved once this change is merged

Change-Id: I448be429df5b0813fa2e2f6ff05ad2936afee1b3
 2016-05-23 17:29:28 -07:00
Jaewan Kim
b917a0e6be Merge "PIP: Handle configuration changes" into nyc-dev 
am: 75822138ad

* commit '75822138ad7f676592c5655df96fe76200b6ffb3':
  PIP: Handle configuration changes

Change-Id: I976b3e89aa4bc255138f411c855ab0ad1d8c50bd
 2016-05-24 00:22:31 +00:00
Jaewan Kim
938c4e3564 Merge "PIP: Handle configuration changes" into nyc-dev 
am: 75822138ad

* commit '75822138ad7f676592c5655df96fe76200b6ffb3':
  PIP: Handle configuration changes

Change-Id: Ic01a93b2031693b9051312598c084e871d84fedc
 2016-05-24 00:22:27 +00:00
Amith Yamasani
f5c37eb3b7 Use correct synchronization lock 
This is to fix an incorrect unregister() that was crashing
the system server. The only way it could be happening is
because of incorrect locking. So, hopefully this fixes it.

Bug: 28813750
Change-Id: Ie3c47ffa3024a0c533e12db0d2d021df8fc0367a
 2016-05-23 17:21:08 -07:00
Dianne Hackborn
9c252700f6 Merge "Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev 2016-05-24 00:18:39 +00:00
Jaewan Kim
75822138ad Merge "PIP: Handle configuration changes" into nyc-dev 2016-05-24 00:05:27 +00:00
Selim Cinek
c22fff6cf6 Added accessibility action for scrolling the notifications 
Also made the stackscroller focusable if and only if it is
scrollable. This will allow it to be important for accessibility
again.

Change-Id: I7773ed3a19d23f6bc62a1b9a23464cfbecd0ec03
Fixes: 25673942
 2016-05-23 16:51:16 -07:00
Chong Zhang
616c7c10b9 Fix wallpaper crop during unlock animation 
Do not crop wallpaper if the wallpaper target is animating but stack
clip mode is not STACK_CLIP_AFTER_ANIM. We can't crop wallpaper with
final bounds as the crop needs to apply before the transform.

bug: 28887408
Change-Id: I62b9a5ca818c3ca8d0af26d807318f63747b8ac4
 2016-05-23 16:48:12 -07:00
Android Build Merger (Role)
11513935f6 Merge "Merge "Support DHCPv4 rebinding state" into nyc-dev am: 4bf3157c45 am: b21c227a39" into nyc-mr1-dev-plus-aosp 2016-05-23 23:38:30 +00:00
Erik Kline
368b21f7d6 Merge "Support DHCPv4 rebinding state" into nyc-dev am: 4bf3157c45 
am: b21c227a39

* commit 'b21c227a39df2bec9488e9eabec9dfe6e34b9bb5':
  Support DHCPv4 rebinding state

Change-Id: Ib880d8bdd9230b76247ffadeef66b2a11dae2435
 2016-05-23 23:37:58 +00:00
Erik Kline
9beb742614 Merge "Support DHCPv4 rebinding state" into nyc-dev am: 4bf3157c45 
am: 648d51fc5d

* commit '648d51fc5dfcbb7c9b33f247eb0b32631d34835d':
  Support DHCPv4 rebinding state

Change-Id: I171247f1a930f97b361a774f74a90b29aad84fc7
 2016-05-23 23:37:42 +00:00
Dianne Hackborn
aa9a59d410 Work on issue #27995384: Time in the top bar different... 
...from time in the clock app

Always reset the kernel's next wake up time when we come
out of it, even if it didn't say an alarm went off.

Also add some more debugging to try to figure out what is
going on.

Change-Id: Ibf36d65b78c841128774d81517a7eb670c396c29
 2016-05-23 16:34:16 -07:00
Erik Kline
648d51fc5d Merge "Support DHCPv4 rebinding state" into nyc-dev 
am: 4bf3157c45

* commit '4bf3157c4560148b9b3f2e6aec7ed0835f6af14a':
  Support DHCPv4 rebinding state

Change-Id: I885181616444d19974085637f80f459c9152ac7d
 2016-05-23 23:29:07 +00:00
Erik Kline
b21c227a39 Merge "Support DHCPv4 rebinding state" into nyc-dev 
am: 4bf3157c45

* commit '4bf3157c4560148b9b3f2e6aec7ed0835f6af14a':
  Support DHCPv4 rebinding state

Change-Id: If31de53174e64e154152b7baa60f23a387092e87
 2016-05-23 23:28:57 +00:00
Adrian Roos
a371f51aab Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e 
am: 3067da37c1

* commit '3067da37c1e945245274ae638373f200d0ff2d29':
  Additional clean up in onUserRemovedLPw

Change-Id: I845144d4487a39973427f39c0b93b5a8acbc9f9b
 2016-05-23 23:28:37 +00:00
Android Build Merger (Role)
dcefb83576 Merge "Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e am: 6d2e1e45f0" into nyc-mr1-dev-plus-aosp 2016-05-23 23:24:33 +00:00
Adrian Roos
5292172fb4 Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e 
am: 6d2e1e45f0

* commit '6d2e1e45f008f1f179fee4d5c966dfdbb31b45ed':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: I7c420fe8cf54cb3e08341a073d5abd7ce0d0ebd7
 2016-05-23 23:23:55 +00:00
Adrian Roos
ddaa2e1fec Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e 
am: 80c470bd52

* commit '80c470bd52af8b5db26cc0aae24da10135883c0d':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: I9a4309d22dbc58081387771ec228c32e2db2cf84
 2016-05-23 23:23:40 +00:00
Erik Kline
4bf3157c45 Merge "Support DHCPv4 rebinding state" into nyc-dev 2016-05-23 23:19:04 +00:00
Fyodor Kupolov
3067da37c1 Merge "Additional clean up in onUserRemovedLPw" into nyc-mr1-dev 2016-05-23 23:18:16 +00:00
Adrian Roos
6d2e1e45f0 Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev 
am: d15cc7a83e

* commit 'd15cc7a83e8d6251d4cf78bb08ee26b9ae949b58':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: I584f2e8ce46358ecdcb1189f3e46400d6f07d346
 2016-05-23 23:15:29 +00:00