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

124749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guang Zhu
ba27041f8c am 395e3f51: am ca3af0d7: am a70d20f6: am 818f83d9: am bf7b64bd: am be659185: use min app launch time in AppLaunch perf test 
* commit '395e3f51805149bf810d55b4e9e8968b76f59fd1':
  use min app launch time in AppLaunch perf test
 2014-03-04 22:08:38 +00:00
Dave Platt
bf588bda2c am f08cd8c6: am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference crashes" 
* commit 'f08cd8c656c4ea6a8c7bf8bafa3f8de72578ebca':
  Harden NsdManager against null-dereference crashes
 2014-03-04 22:06:56 +00:00
Dave Platt
f08cd8c656 am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference crashes" 
* commit '7d8262cb554c41892794f23b92e01b52458288bb':
  Harden NsdManager against null-dereference crashes
 2014-03-04 22:02:55 +00:00
Dave Platt
7d8262cb55 am 22f66b76: Merge "Harden NsdManager against null-dereference crashes" 
* commit '22f66b76f5e49704f3be76ad3fff7e4b5456864d':
  Harden NsdManager against null-dereference crashes
 2014-03-04 13:59:57 -08:00
Dave Platt
22f66b76f5 Merge "Harden NsdManager against null-dereference crashes" 2014-03-04 21:55:56 +00:00
Will Haldean Brown
2faf28cf85 am 11c51608: am bd79652a: Merge "Add swipe-to-dismiss support to PhoneWindow." into klp-modular-dev 
* commit '11c51608ee1c368dd38b134603e85943629c6f44':
  Add swipe-to-dismiss support to PhoneWindow.
 2014-03-04 21:32:22 +00:00
Will Haldean Brown
11c51608ee am bd79652a: Merge "Add swipe-to-dismiss support to PhoneWindow." into klp-modular-dev 
* commit 'bd79652a9afeee1e81f0f51d11e5869091f58af9':
  Add swipe-to-dismiss support to PhoneWindow.
 2014-03-04 21:27:11 +00:00
Dave Platt
3fc376b733 Harden NsdManager against null-dereference crashes 
Due to race conditions or programming errors, the NsdManager
can attempt to process an asynchronous status message (and issue
a callback to the listener) after the listener has already been
removed from the NsdManager state.  This causes dereferencing of
null objects, and a crash.

Split out the three async-queue message cases:  these are ones
in which message.arg2 does not hold an NsdManager array index
and the code should not interpret this field as if it were.

Add an explicit check for "null listener" (the array index in the
message has already been released), log a warning, and exit early.

Safeguard accesses to the "NSD service type" string from a (possibly
null) NsdServiceInfo object... return a constant "?" string rather
than crashing.

Bug: 9016259

Change-Id: I40aabdfc65d86fdd0eaac7a1e7e56e6ff69796cf
 2014-03-04 13:25:02 -08:00
Zhijun He
add749f664 Camera2: make shading.mode key public 
Change-Id: I94f506be19940b1881e65a8de9fe8198194932a3
 2014-03-04 21:23:34 +00:00
Will Haldean Brown
bd79652a9a Merge "Add swipe-to-dismiss support to PhoneWindow." into klp-modular-dev 2014-03-04 21:22:30 +00:00
John Spurlock
0dd1a82883 am 76ee9b72: am 3b869238: am c6ecac77: am 38f81ccc: am fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev 
* commit '76ee9b727a0ec0105a0aafa79f163f70b9533430':
  Volume panel should not clear system ui flags.
 2014-03-04 20:42:41 +00:00
John Spurlock
42c0c51930 am a12c0bf8: am ed7d7cba: am c3371eb5: am 49eac16e: am 8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev 
* commit 'a12c0bf8944ab7fc5dbed1934f1bf03d242b8c6a':
  Show hideycling for non-primary users.
 2014-03-04 20:42:39 +00:00
John Spurlock
6db2cfe6e1 am b61fde1f: am b85214bc: am 0a3bc3c4: am 2cc271eb: am d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev 
* commit 'b61fde1f3d3352c510263d91b1654bcfd075c10d':
  Allow lights-out + bar icon dimming on low-end devices.
 2014-03-04 20:42:37 +00:00
Guang Zhu
395e3f5180 am ca3af0d7: am a70d20f6: am 818f83d9: am bf7b64bd: am be659185: use min app launch time in AppLaunch perf test 
* commit 'ca3af0d7e89e52d05050e50c09360bb8f200c6cf':
  use min app launch time in AppLaunch perf test
 2014-03-04 20:42:33 +00:00
John Spurlock
76ee9b727a am 3b869238: am c6ecac77: am 38f81ccc: am fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev 
* commit '3b86923854069fa1b3bcabc8643a5e2db40d7b10':
  Volume panel should not clear system ui flags.
 2014-03-04 20:36:56 +00:00
John Spurlock
a12c0bf894 am ed7d7cba: am c3371eb5: am 49eac16e: am 8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev 
* commit 'ed7d7cba9d698aa619b654a485d7c88594ae5090':
  Show hideycling for non-primary users.
 2014-03-04 20:36:53 +00:00
John Spurlock
b61fde1f3d am b85214bc: am 0a3bc3c4: am 2cc271eb: am d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev 
* commit 'b85214bcc32ff26a1dbc035c0128a2bebb193149':
  Allow lights-out + bar icon dimming on low-end devices.
 2014-03-04 20:36:50 +00:00
Guang Zhu
ca3af0d7e8 am a70d20f6: am 818f83d9: am bf7b64bd: am be659185: use min app launch time in AppLaunch perf test 
* commit 'a70d20f6037a5c3f6ee18244a3b547454beb8399':
  use min app launch time in AppLaunch perf test
 2014-03-04 20:36:47 +00:00
Chris Craik
c152547815 Pass correct paint to HW layer 
bug:13299767

Change-Id: I8372a830b2076c489ed0837aba9a85650a4202fd
 2014-03-04 12:06:19 -08:00
John Spurlock
3b86923854 am c6ecac77: am 38f81ccc: am fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev 
* commit 'c6ecac77cfa35bbc72a4b7e1e3374ad00f83b305':
  Volume panel should not clear system ui flags.
 2014-03-04 19:19:14 +00:00
John Spurlock
ed7d7cba9d am c3371eb5: am 49eac16e: am 8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev 
* commit 'c3371eb5d4bde6dc11499efb313f7529a6bf6d59':
  Show hideycling for non-primary users.
 2014-03-04 19:19:10 +00:00
John Spurlock
b85214bcc3 am 0a3bc3c4: am 2cc271eb: am d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev 
* commit '0a3bc3c4d204c64267641dcad0d699a5db38d989':
  Allow lights-out + bar icon dimming on low-end devices.
 2014-03-04 19:19:04 +00:00
John Spurlock
c6ecac77cf am 38f81ccc: am fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev 
* commit '38f81ccc768958b1a9100cb2caa93ec3aedd9b5e':
  Volume panel should not clear system ui flags.
 2014-03-04 19:15:56 +00:00
John Spurlock
c3371eb5d4 am 49eac16e: am 8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev 
* commit '49eac16ec00ea63feaafc137a1d313fcb4374b36':
  Show hideycling for non-primary users.
 2014-03-04 19:15:53 +00:00
John Spurlock
0a3bc3c4d2 am 2cc271eb: am d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev 
* commit '2cc271ebbccc251ef96edee16b79a22fcf856244':
  Allow lights-out + bar icon dimming on low-end devices.
 2014-03-04 19:15:49 +00:00
John Spurlock
38f81ccc76 am fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev 
* commit 'fee6f69e8321c3f94c2b341fe483f7b1f6534169':
  Volume panel should not clear system ui flags.
 2014-03-04 19:12:40 +00:00
John Spurlock
49eac16ec0 am 8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev 
* commit '8ec59a72889f7da0c13119977ca62ada8a1498e0':
  Show hideycling for non-primary users.
 2014-03-04 19:12:37 +00:00
John Spurlock
2cc271ebbc am d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev 
* commit 'd36ede391619e6fc8a1553f5b2f4b33b3603cd65':
  Allow lights-out + bar icon dimming on low-end devices.
 2014-03-04 19:12:33 +00:00
John Spurlock
fee6f69e83 Merge "Volume panel should not clear system ui flags." into klp-dev 2014-03-04 19:09:20 +00:00
John Spurlock
8ec59a7288 Merge "Show hideycling for non-primary users." into klp-dev 2014-03-04 19:08:47 +00:00
Andy McFadden
dcd1a1027f Merge "Avoid restrictive locking around EGL calls" 2014-03-04 19:08:44 +00:00
John Spurlock
d36ede3916 Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev 2014-03-04 19:08:31 +00:00
Guang Zhu
a70d20f603 am 818f83d9: am bf7b64bd: am be659185: use min app launch time in AppLaunch perf test 
* commit '818f83d965be3cc1af88a1c700115bff0dccf3a3':
  use min app launch time in AppLaunch perf test
 2014-03-04 18:46:23 +00:00
Guang Zhu
818f83d965 am bf7b64bd: am be659185: use min app launch time in AppLaunch perf test 
* commit 'bf7b64bd30bc1e7fabcfc7f46132f504b30ba97c':
  use min app launch time in AppLaunch perf test
 2014-03-04 18:42:17 +00:00
Guang Zhu
bf7b64bd30 am be659185: use min app launch time in AppLaunch perf test 
* commit 'be6591856bd62e14d7c87dd927db0cbbed242d81':
  use min app launch time in AppLaunch perf test
 2014-03-04 18:38:32 +00:00
Guang Zhu
be6591856b use min app launch time in AppLaunch perf test 
Change-Id: Id3a5872ff29fba5daeff058f0842fd011e50a0a1
(cherry picked from commit 2861a89bed9066e206917c41357a5e589e8482cb)
 2014-03-04 18:35:05 +00:00
Michael Chock
b506624536 Avoid restrictive locking around EGL calls 
Do not use critical section variants of JNI array mapping operations
when making EGL calls. They impose unnecessary restrictions on the
EGL implementation that can lead to intermittent crashes. Using the
non-critical variants makes no detectable performance difference.

Change-Id: I4ef643f1a7fcdc5995538ff9d543f43f33c8e412
 2014-03-04 09:59:30 -08:00
Robert Greenwalt
30a2bc87d4 Only apply tcp buffer sizes for default net 
This may mean that secondary networks have bad network settings,
but currently default settings are overriden by secondary nets
which seems worse.

bug:13211589
Change-Id: I08d56e618208781bf6b21a88663c2b8503a4f226
 2014-03-04 09:56:05 -08:00
Craig Mautner
2e416f1674 am f716acc6: am 80b13579: am 7a93aa2f: am a0b4d0ce: Merge "Avoid duplication of AppWindowToken in created Task" 
* commit 'f716acc66f2c30503f8c10f57ecba3d597107801':
  Avoid duplication of AppWindowToken in created Task
 2014-03-04 17:55:47 +00:00
Yuhao Zheng
d5273da95b Merge "Allow more proxy bypass patterns" 2014-03-04 17:44:04 +00:00
Yuhao Zheng
5c43d4e451 Merge "Return detailed reason of invalid proxy settings" 2014-03-04 17:43:47 +00:00
Will Haldean Brown
ca6234e084 Add swipe-to-dismiss support to PhoneWindow. 
This adds a new window feature -- FEATURE_SWIPE_TO_DISMISS -- and a
theme attribute to activate that feature. When the feature is
activated, a SwipeDismissLayout is inflated as the DecorView layout.
SwipeDismissLayout intercepts touch events and steals ones that are
large swipes to the right if its children don't. PhoneWindow registers
handlers that listen for these swipe events, translate the window when
necessary, and finish the activity at the end of the gesture.

Change-Id: I512e758f3c3ffd3b353dba3b911c0e80a88d6f5f
 2014-03-04 09:26:15 -08:00
Craig Mautner
f716acc66f am 80b13579: am 7a93aa2f: am a0b4d0ce: Merge "Avoid duplication of AppWindowToken in created Task" 
* commit '80b1357909e57aa330c2624b8a5baac9f3bdce3f':
  Avoid duplication of AppWindowToken in created Task
 2014-03-04 17:21:11 +00:00
Robert Greenwalt
0f32374769 Merge "Only apply tcp buffer sizes for default net" 2014-03-04 17:20:18 +00:00
Craig Mautner
80b1357909 am 7a93aa2f: am a0b4d0ce: Merge "Avoid duplication of AppWindowToken in created Task" 
* commit '7a93aa2fc2555b0de41bb5f30eb0e9cce2413084':
  Avoid duplication of AppWindowToken in created Task
 2014-03-04 17:14:58 +00:00
Craig Mautner
7a93aa2fc2 am a0b4d0ce: Merge "Avoid duplication of AppWindowToken in created Task" 
* commit 'a0b4d0ce471cf10888bac4d4ec5b97fd562ad756':
  Avoid duplication of AppWindowToken in created Task
 2014-03-04 09:10:36 -08:00
Baligh Uddin
05f5573252 Merge "Import translations. DO NOT MERGE" 2014-03-04 17:06:36 +00:00
Tom O'Neill
fe6d3c5494 Remove reference to internal bug number 
Change-Id: Idec0d6529ee9742b226260df09cfe7cd2b3823fb
 2014-03-04 08:26:17 -08:00
Tom O'Neill
5d8f40baeb Merge "Removing a test provider clears its enabled state" 2014-03-04 16:24:44 +00:00
Craig Mautner
a0b4d0ce47 Merge "Avoid duplication of AppWindowToken in created Task" 2014-03-04 15:19:17 +00:00