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

107246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
cfc593d573 am 38b9aaa0: am 2cc84c63: add VID for Haier to docs 
* commit '38b9aaa0fc1b49fa4e734bb0eba28711b6b0d165':
  add VID for Haier to docs
 2013-05-22 17:08:20 -07:00
Scott Main
38b9aaa0fc am 2cc84c63: add VID for Haier to docs 
* commit '2cc84c638a3a1048d9704a8c987d1436dd27fcd6':
  add VID for Haier to docs
 2013-05-22 17:06:45 -07:00
Craig Mautner
bfeb1b008e Merge "Revert "Add stackId to RecentTaskInfo"" 2013-05-22 23:15:12 +00:00
Craig Mautner
9d851de6cc Revert "Add stackId to RecentTaskInfo" 
Need to modify the API as well.
This reverts commit b9b9477581ce5f72a679dd1cd9a85e6c8f73944a

Change-Id: I34ea371408930b6b1bf4c53ad9ab8418b0070dbc
 2013-05-22 23:14:05 +00:00
Jim Miller
d794e648c3 Check for invalid pointer index in PagedView 
Fixes bug 9088039

Change-Id: I54897df39adbf224ef3dd3de4ce7254fb70b587c
 2013-05-22 16:05:08 -07:00
Jeff Brown
4418bed617 am e20fbc6f: am d6619ed8: Merge "Add a queue of pending finished input events." into jb-mr2-dev 
* commit 'e20fbc6feb6709c01bf0afdf86a75882c9a0e663':
  Add a queue of pending finished input events.
 2013-05-22 15:48:45 -07:00
Jeff Brown
e20fbc6feb am d6619ed8: Merge "Add a queue of pending finished input events." into jb-mr2-dev 
* commit 'd6619ed89ff7e10b0b66aadc353cfea171929344':
  Add a queue of pending finished input events.
 2013-05-22 15:46:57 -07:00
Jeff Brown
d6619ed89f Merge "Add a queue of pending finished input events." into jb-mr2-dev 2013-05-22 22:44:17 +00:00
Winson Chung
a22cbf9822 Merge "Add stackId to RecentTaskInfo" 2013-05-22 22:13:27 +00:00
Craig Mautner
b9b9477581 Add stackId to RecentTaskInfo 
Necessary for multi-stack activity overview.

Fixes bug 9092356.

Change-Id: I91fc68ebf72114224c8e651261101ac14517ff86
 2013-05-22 15:03:10 -07:00
Geremy Condra
8bae56e278 am 8acde57d: am 1b12ab00: am 9c759e39: Merge "Fix SELinux get.. methods aborting on invalid address" 
* commit '8acde57d23d7e85b493d4d9502e834509f1c46ba':
  Fix SELinux get.. methods aborting on invalid address
 2013-05-22 13:07:02 -07:00
Geremy Condra
8acde57d23 am 1b12ab00: am 9c759e39: Merge "Fix SELinux get.. methods aborting on invalid address" 
* commit '1b12ab00998b96046ef617a8d109fadcf29a1b39':
  Fix SELinux get.. methods aborting on invalid address
 2013-05-22 13:05:14 -07:00
Geremy Condra
1b12ab0099 am 9c759e39: Merge "Fix SELinux get.. methods aborting on invalid address" 
* commit '9c759e3968015c0d30a1a049754e4514adfdb565':
  Fix SELinux get.. methods aborting on invalid address
 2013-05-22 13:03:21 -07:00
Geremy Condra
9c759e3968 Merge "Fix SELinux get.. methods aborting on invalid address" 2013-05-22 19:25:37 +00:00
Jeff Tinker
a70924bedd am eaa9ce70: am 606ab470: Merge "Improve exception error messages to help diagnose app errors" into jb-mr2-dev 
* commit 'eaa9ce7064ad4978d5acaafd4e797b5186ff03de':
  Improve exception error messages to help diagnose app errors
 2013-05-22 12:16:03 -07:00
Jeff Tinker
63c7f94c48 am 09d6ad37: am 2161b7cb: Merge "Fix invalid keyType translation in MediaDrm.getKeyRequest" into jb-mr2-dev 
* commit '09d6ad37f790f1e135c4dbe71109b33ae29a94cc':
  Fix invalid keyType translation in MediaDrm.getKeyRequest
 2013-05-22 12:16:00 -07:00
Jeff Tinker
eaa9ce7064 am 606ab470: Merge "Improve exception error messages to help diagnose app errors" into jb-mr2-dev 
* commit '606ab4706df372974cc86eb1bb1c50d79422d7cc':
  Improve exception error messages to help diagnose app errors
 2013-05-22 12:14:15 -07:00
Jeff Tinker
09d6ad37f7 am 2161b7cb: Merge "Fix invalid keyType translation in MediaDrm.getKeyRequest" into jb-mr2-dev 
* commit '2161b7cb79576b82a8f3bb964e25739e488d4c29':
  Fix invalid keyType translation in MediaDrm.getKeyRequest
 2013-05-22 12:14:13 -07:00
Jeff Tinker
606ab4706d Merge "Improve exception error messages to help diagnose app errors" into jb-mr2-dev 2013-05-22 19:12:39 +00:00
Jeff Tinker
2161b7cb79 Merge "Fix invalid keyType translation in MediaDrm.getKeyRequest" into jb-mr2-dev 2013-05-22 19:12:00 +00:00
Jeff Brown
56513492ea Add a queue of pending finished input events. 
Although in practice an application or IME is unlikely to fill up
the input channel with finish events, it can happen when events are
being delivered very rapidly.  Handle this situation by queuing
up the pending finish events until the socket becomes writable again.

Bug: 9034301
Change-Id: I938a62a75d12106a19cff2d016ba7af0db877ecf
 2013-05-22 10:33:48 -07:00
Andrew Wilson
152942be13 Compare binder instances when checking if listeners match. 
Bug: 9069919
Change-Id: I06130105cb703de35de76ab2fceba3855fa5407a
 2013-05-22 09:35:35 -07:00
Scott Main
2cc84c638a add VID for Haier to docs 
Change-Id: I3999d2b9d712ac3f5d2ce6325a30d07a743dbc15
 2013-05-22 08:34:49 -07:00
The Android Open Source Project
a66c2f10d5 am 242e1d28: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '242e1d2840b439463e0a44ea989ff0afbe07068f':
 2013-05-22 07:27:37 -07:00
The Android Open Source Project
242e1d2840 Reconcile with jb-mr2-release - do not merge 
Change-Id: I6b893f5e3dfaf567b0e2c5d7eef423556603d1a9
 2013-05-22 07:22:55 -07:00
Richard Haines
81ad284517 Fix SELinux get.. methods aborting on invalid address 
SELinux get.. JNI need the 'security_context_t tmp' entries set
to NULL, otherwise on error freecon() tries to release uninitialised
memory causing apps to abort with invalid address.
Also fixed getPeerCon ALOGV call as this caused Zyote to abort when
verbose logging set.

Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>
 2013-05-22 15:12:16 +01:00
Adam Koch
116d791e25 am 289b14f5: am d51fc576: am 3e4ea33f: am 4f6d0cbd: am 7258e6bc: am 1fc7e59b: am 14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs 
* commit '289b14f56c122a75ecbea3d8b878b6f1d424cacc':
  Doc change: fix minor typo in ContactsContract.RawContacts.
 2013-05-22 06:56:36 -07:00
Adam Koch
289b14f56c am d51fc576: am 3e4ea33f: am 4f6d0cbd: am 7258e6bc: am 1fc7e59b: am 14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs 
* commit 'd51fc5763d3ce7895e168ace65da4c253b16d57e':
  Doc change: fix minor typo in ContactsContract.RawContacts.
 2013-05-22 06:53:34 -07:00
Adam Koch
d51fc5763d am 3e4ea33f: am 4f6d0cbd: am 7258e6bc: am 1fc7e59b: am 14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs 
* commit '3e4ea33f087926d9039f7b4428dc967a8e760209':
  Doc change: fix minor typo in ContactsContract.RawContacts.
 2013-05-22 06:52:00 -07:00
Adam Koch
3e4ea33f08 am 4f6d0cbd: am 7258e6bc: am 1fc7e59b: am 14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs 
* commit '4f6d0cbdd9372754b1b5b112e2b724b3852ac12b':
  Doc change: fix minor typo in ContactsContract.RawContacts.
 2013-05-22 06:49:43 -07:00
Adam Koch
4f6d0cbdd9 am 7258e6bc: am 1fc7e59b: am 14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs 
* commit '7258e6bc57fb3cb023a4ca219f1355cf55ea93bf':
  Doc change: fix minor typo in ContactsContract.RawContacts.
 2013-05-22 06:45:33 -07:00
Adam Koch
7258e6bc57 am 1fc7e59b: am 14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs 
* commit '1fc7e59b3301bb74223393354571ad4e6b7ecfce':
  Doc change: fix minor typo in ContactsContract.RawContacts.
 2013-05-22 06:43:16 -07:00
Adam Koch
1fc7e59b33 am 14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs 
* commit '14233ee5d06c468f953dff2d900a9cf32f9737c0':
  Doc change: fix minor typo in ContactsContract.RawContacts.
 2013-05-22 06:41:26 -07:00
Adam Koch
14233ee5d0 Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs 2013-05-22 13:36:57 +00:00
The Android Automerger
e484a4b3fe merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-22 05:55:23 -07:00
Romain Guy
0c63d7c239 am 469cc57c: am 2f35d244: Merge "Avoid extraneous EGL surface allocations Bug #8667873" into jb-mr2-dev 
* commit '469cc57ca77687420246dd679e94eb242fcec41d':
  Avoid extraneous EGL surface allocations Bug #8667873
 2013-05-21 19:12:50 -07:00
Romain Guy
469cc57ca7 am 2f35d244: Merge "Avoid extraneous EGL surface allocations Bug #8667873" into jb-mr2-dev 
* commit '2f35d2441e59b996a56653881fdc2f52d4eeb644':
  Avoid extraneous EGL surface allocations Bug #8667873
 2013-05-21 19:11:16 -07:00
Romain Guy
2f35d2441e Merge "Avoid extraneous EGL surface allocations Bug #8667873" into jb-mr2-dev 2013-05-22 02:08:24 +00:00
Ying Wang
06acbf0e89 Move offline-pdk to where the source is. 
Change-Id: I10b05c28954a27f11482751e14287ec21422dce2
 2013-05-21 18:03:29 -07:00
Romain Guy
7f77736599 Merge "Merge scaled bitmaps with translated bitmaps" 2013-05-22 00:43:48 +00:00
Romain Guy
2db5e993b6 Merge scaled bitmaps with translated bitmaps 
Change-Id: I03089f48f97b69fcb4a0171984d3ff548d41c4a8
 2013-05-21 17:42:43 -07:00
Alan Viverette
0e2d281083 Fix number picker accessibility focus. 
The node bounds populated by the child TextView were not consistent
with the bounds manually populated for its parent NumberPicker.

Bug: 9072003
Change-Id: Icbfa64f52cf11fd39c7243936227b8ba36280c3c
 2013-05-21 17:15:30 -07:00
Chris Craik
41541825bc Use individual glyph positions to determine text bounds. 
bug:8766924

Previously text bounds were calculated to be from 0 to totalAdvance in
the X, and from the font's top to bottom. These are incorrect,
especially in light of the font fallback mechanism.

Now, we calculate the bounds of the text as we layout each glyph.
Since these are much tighter bounds in the common case, this
significantly reduces the amount of clipping required (which in turn
enables more aggressive text merging).

Change-Id: I172e5466bf5975bf837af894a9964c41db538746
 2013-05-21 23:04:05 +00:00
Nick Kralevich
631500ef58 Move VelocityTracker.cpp to target build only 
VelocityTracker.cpp makes reference to property_get, which
doesn't make a lot of sense when compiling for the host.
Compile this file for the target only.

Keyboard.cpp: Remove unnecessary include file.

Change-Id: Iee9edd81953b2e7e815005770ce286a6ec586f20
 2013-05-21 15:04:14 -07:00
Chris Craik
7f43674db3 Merge "Fix DISPLAY_LIST_DEBUG" 2013-05-21 20:30:19 +00:00
Michael Wright
a66c789f61 Merge "Pipe through bounding box information" 2013-05-21 20:03:49 +00:00
Jeff Tinker
17b8922785 Fix invalid keyType translation in MediaDrm.getKeyRequest 
bug: 9070897
Change-Id: Ib9b4174e08b1c828d0204e0ab65bc3d7c2efcedf
 2013-05-21 13:00:58 -07:00
Robert Greenwalt
11f33b50bb am 657eb614: am 4c32885c: Merge "Don\'t put up wifi-available note when disabled" into jb-mr2-dev 
* commit '657eb614ef0d5b56dfbfe3669db18f5a59b57c29':
  Don't put up wifi-available note when disabled
 2013-05-21 12:58:00 -07:00
Robert Greenwalt
657eb614ef am 4c32885c: Merge "Don\'t put up wifi-available note when disabled" into jb-mr2-dev 
* commit '4c32885c4249be9b0a9e674b96ebacc78152b47e':
  Don't put up wifi-available note when disabled
 2013-05-21 12:56:04 -07:00
Jeff Tinker
eada5376d9 Improve exception error messages to help diagnose app errors 
bug: 9072051

Change-Id: I45057951d1a62b1b4a996e85f01601239e1b7161
 2013-05-21 12:55:59 -07:00