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

119877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filip Gruszczyński
d54530e9ce am 1ae480a2: Merge changes I2104037d,I125c4a00 into klp-modular-dev 
* commit '1ae480a24deed18cb1ca95344995150f3a3f5c98':
  Passing and using defStyle in ViewGroup initFromAttributes.
  Set android:descendantFocusability to blocksDescendants for all NumberPicker in clockwork.
 2014-03-06 00:30:17 +00:00
Filip Gruszczyński
1ae480a24d Merge changes I2104037d,I125c4a00 into klp-modular-dev 
* changes:
  Passing and using defStyle in ViewGroup initFromAttributes.
  Set android:descendantFocusability to blocksDescendants for all NumberPicker in clockwork.
 2014-03-06 00:27:40 +00:00
David 'Digit' Turner
a05e752615 am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host sysroot." 
* commit '9c6f41e3eb2258d52480be04dd8916a10f8be8db':
  aidl: Support building with updated host sysroot.
 2014-03-05 23:18:20 +00:00
Dianne Hackborn
75870cf391 am 75374879: am ea391750: am 5e578e17: am 40a26004: Issue #13308712: Add --checkin to package manager dump. 
* commit '75374879938c1767b0266132672361487f2f58d4':
  Issue #13308712: Add --checkin to package manager dump.
 2014-03-05 23:17:40 +00:00
David 'Digit' Turner
9c6f41e3eb am be7b8f4f: Merge "aidl: Support building with updated host sysroot." 
* commit 'be7b8f4f4c62239ad20202e4bbe8120d5e3dcf82':
  aidl: Support building with updated host sysroot.
 2014-03-05 15:14:31 -08:00
Dianne Hackborn
7537487993 am ea391750: am 5e578e17: am 40a26004: Issue #13308712: Add --checkin to package manager dump. 
* commit 'ea391750fbf78b395b414147dba6426ad907431d':
  Issue #13308712: Add --checkin to package manager dump.
 2014-03-05 23:14:04 +00:00
Dianne Hackborn
ea391750fb am 5e578e17: am 40a26004: Issue #13308712: Add --checkin to package manager dump. 
* commit '5e578e17f4392d1baf41772ab45347bc8bcccc38':
  Issue #13308712: Add --checkin to package manager dump.
 2014-03-05 23:11:07 +00:00
David 'Digit' Turner
be7b8f4f4c Merge "aidl: Support building with updated host sysroot." 2014-03-05 23:10:45 +00:00
Dianne Hackborn
5e578e17f4 am 40a26004: Issue #13308712: Add --checkin to package manager dump. 
* commit '40a26004810623f02546a31cb0ce49a0502bdff7':
  Issue #13308712: Add --checkin to package manager dump.
 2014-03-05 23:07:45 +00:00
David 'Digit' Turner
ea6d2197ba aidl: Support building with updated host sysroot. 
This patch fixes tools/aidl/Type.cpp to compile with
a more recent SDK host toolchain sysroot (that has not
been submitted yet).

The main issue is that the code uses ssize_t which is
defined in <sys/types.h>, but didn't include the header
directly.

Apparently, this no longer compiles when using the Ubuntu
10.04 libc6-dev headers (the current SDK toolchain is
based on Ubuntu 8.04), so perform an explicit include
to fix this.

NOTE: This doesn't break the Windows SDK build.

Change-Id: Idcacf8f8d1c606b39bf8aa75ab409aa0c2a3cd5a
 2014-03-05 23:57:46 +01:00
Svetoslav
8c6ed03c8f am 1caa092f: Allow click listener registration in NumberPicker. 
* commit '1caa092f94aaa4b9b7b382263dfd13581d92d2de':
  Allow click listener registration in NumberPicker.
 2014-03-05 22:55:58 +00:00
Filip Gruszczyński
c16ba8cda7 Passing and using defStyle in ViewGroup initFromAttributes. 
Change-Id: I2104037d6f701aa3a27bf09226aca171ec77495d
 2014-03-05 14:43:49 -08:00
Svetoslav
1caa092f94 Allow click listener registration in NumberPicker. 
NumberPicker is composed of three areas, increment, decrement, and value,
which take the entire space. Hence, adding a click listener was a no-op.
Clicking on the value brings up the IME but for devices with very small
screens a developer may want to override this default behavior to say
confirm the selection.

This change allows adding a click listener to NumberPicker to override the
behavior of clicking on the current value. This is applicable only to the
new look and feel of the NumberPicker, i.e. the holo themes. This change
is safe as previously setting a click listener had no effect.

bug:13287234

Change-Id: I34e12a2e2bd64344a4797153fa6c820001a4722e
(cherry picked from commit 46a27efe9528ac3c5b37726707844e7c868815ac)
 2014-03-05 22:37:34 +00:00
Robert Greenwalt
c1ca3bac5d am bf9eec4c: am 1c8ba7e5: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev 
* commit 'bf9eec4c3bbbacd0954d819c18709962a81338bf':
  Only apply tcp buffer sizes for default net
 2014-03-05 22:17:24 +00:00
Christopher Tate
777b8a808e am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev 
* commit '422b2656741520448815b230f7c73ad67a4c4e95':
  Adapt to underlying changes in the PBKDF2 implementation
 2014-03-05 22:17:21 +00:00
Robert Greenwalt
bf9eec4c3b am 1c8ba7e5: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev 
* commit '1c8ba7e551274782f3f61b90807711a056cc9730':
  Only apply tcp buffer sizes for default net
 2014-03-05 22:14:46 +00:00
Filip Gruszczyński
b971b89c78 Set android:descendantFocusability to blocksDescendants for all NumberPicker in clockwork. 
Change-Id: I125c4a00f4061ef6756e719e7f6b9e5f4dd72d81
 2014-03-05 12:59:58 -08:00
Christopher Tate
422b265674 resolved conflicts for merge of c45ff35f to klp-modular-dev 
Change-Id: Id1799e49891dc72e2e9c55fd9f418ceee94a7875
 2014-03-05 12:28:04 -08:00
Brian Carlstrom
a258b4a9e8 am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime" 
* commit '485e3b459491267ae1390e1df5ff8f7d4695f819':
  Add dex2oat-flags plumbing to AndroidRuntime
 2014-03-05 19:29:40 +00:00
Brian Carlstrom
485e3b4594 am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime" 
* commit '5c126c3d1703d8bef9a55dcc01f1fabf17811f60':
  Add dex2oat-flags plumbing to AndroidRuntime
 2014-03-05 11:26:44 -08:00
Brian Carlstrom
5c126c3d17 Merge "Add dex2oat-flags plumbing to AndroidRuntime" 2014-03-05 19:23:48 +00:00
Dianne Hackborn
40a2600481 Issue #13308712: Add --checkin to package manager dump. 
Change-Id: I50a559ea4bded47a792e1b5b319a5bbed41b4233
 2014-03-05 11:00:54 -08:00
Robert Greenwalt
1c8ba7e551 am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev 
* commit 'bad3a9e66fb103ec96ea89ce9eff7270333d5926':
  Only apply tcp buffer sizes for default net
 2014-03-05 18:31:18 +00:00
Robert Greenwalt
bad3a9e66f am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev 
* commit '2d1e8c49582fb91df0a05a778c228fc1cd89e026':
  Only apply tcp buffer sizes for default net
 2014-03-05 18:27:03 +00:00
Robert Greenwalt
2d1e8c4958 Merge "Only apply tcp buffer sizes for default net" into klp-dev 2014-03-05 18:23:56 +00:00
Christopher Tate
7a4e519eda am 8106dce7: am a6c59158: am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit '8106dce705ba69d5bc0ccafa8e21068216f42a5f':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 01:05:31 +00:00
Christopher Tate
8106dce705 am a6c59158: am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit 'a6c59158761423551941f6ed338a117658e581ad':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 01:00:50 +00:00
Christopher Tate
c45ff35f21 am 1efc6e52: am 1d13f13d: Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev 
* commit '1efc6e52d65389463ad52c32df02d68493df0f48':
  Adapt to underlying changes in the PBKDF2 implementation
 2014-03-05 00:57:22 +00:00
Christopher Tate
a6c5915876 am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit 'f63ae644a80ef2d0bd7bfb448eebb19691e4b6ec':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 00:57:18 +00:00
Christopher Tate
1efc6e52d6 am 1d13f13d: Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev 
* commit '1d13f13deac644bddbae8a1f92642074a32d7a6c':
  Adapt to underlying changes in the PBKDF2 implementation
 2014-03-05 00:54:17 +00:00
Christopher Tate
f63ae644a8 am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit '1e995c76485f8a7477177886890b834c31e8d1a6':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 00:54:14 +00:00
Christopher Tate
1d13f13dea Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev 2014-03-05 00:51:33 +00:00
Christopher Tate
1e995c7648 Merge "Update PackageMonitor to recognize new 'replacing' semantics" into klp-dev 2014-03-05 00:51:04 +00:00
Brian Carlstrom
3beff1e023 Add dex2oat-flags plumbing to AndroidRuntime 
Change-Id: Idaa7e5351e146d76e1972cbe4d93af69f0b999a6
 2014-03-04 14:08:46 -08: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
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
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
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
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