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

105319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
a9a0409d62 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-23 16:14:16 +00:00
The Android Open Source Project
701cf5e1bf Reconcile with jb-mr2-release - do not merge 
Change-Id: I339cc5b68bd236440c5d2ccbbc800ffcd3a0e7c6
 2013-05-23 08:05:15 -07:00
Chet Haase
c725903eec Restore previous alpha value on noop'd DisplayList operations 
Previously, when a DisplayList operation was rejected because it was not
in the clip bounds, the code would not properly restore the previous
state, leading to errors in alpha values of the noop'd op being applied
to unrelated operations later in the DisplayList.

Issue #9051935 Flash of grey background when transitioning to conversation view

Change-Id: I56645cc9ebf2e07be0228ca5e249213dbeb10d7d
 2013-05-23 07:57:17 -07:00
Amith Yamasani
77049e1303 am 60b4afed: Merge "Fix account filtering for specific package name" into jb-mr2-dev 
* commit '60b4afedbeea11983b748d0d8ea9032d177dd6e7':
  Fix account filtering for specific package name
 2013-05-23 07:41:09 -07:00
Amith Yamasani
60b4afedbe Merge "Fix account filtering for specific package name" into jb-mr2-dev 2013-05-23 14:39:07 +00:00
The Android Automerger
be0e8b6700 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-23 05:55:19 -07:00
Baligh Uddin
b52156cd67 Import translations. DO NOT MERGE 
Change-Id: I8af9de6adcf346f5d2b9241eceefdc42a4c42026
Auto-generated-cl: translation import
 2013-05-22 22:14:01 -07:00
Amith Yamasani
e342309704 Fix account filtering for specific package name 
Hacks to enable gms to see accounts were interfering with checking for
explicit package name.

Bug: 9095427
Change-Id: Iae65ea2a678d7403d023fa1a61c01347b77c3b5a
 2013-05-22 19:41:45 -07:00
Jeff Brown
f4eef69721 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 19:12:35 -07:00
Scott Main
2651032064 fix javadoc links. 
turns out, without parameters, javadoc will link to the best matching
method signature, even if it's from the superclass. So these were pointing
to Object.nofify()

Change-Id: I13688f2b65e898d1f000a34c88d0aaed928884b5
 2013-05-22 19:00:09 -07:00
kmccormick
cd7e9ebbba Doc update: fix GCM TOC 
Change-Id: I38753475fdf6c33d80e0e099cb6c5dcf2f05de0b
 2013-05-22 18:25:21 -07:00
Ying Wang
6c5b979917 am 1fa3cdf0: Merge "Move offline-pdk to where the source is." into jb-mr2-dev 
* commit '1fa3cdf0cbc9bc788a313eda5d3ca3e2ad77fcc4':
  Move offline-pdk to where the source is.
 2013-05-22 18:00:28 -07:00
Ying Wang
1fa3cdf0cb Merge "Move offline-pdk to where the source is." into jb-mr2-dev 2013-05-23 00:56:20 +00:00
Scott Main
13a4f1a23d am 9d38ba20: am cfc593d5: am 38b9aaa0: am 2cc84c63: add VID for Haier to docs 
* commit '9d38ba200eba5973256bf0c15cb394efc9211561':
  add VID for Haier to docs
 2013-05-22 17:14:28 -07:00
Scott Main
9d38ba200e am cfc593d5: am 38b9aaa0: am 2cc84c63: add VID for Haier to docs 
* commit 'cfc593d5736b627e0fffe92e511ee326b9f6d326':
  add VID for Haier to docs
 2013-05-22 17:10:28 -07:00
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
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
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
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
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
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
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
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
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
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
Robert Greenwalt
4c32885c42 Merge "Don't put up wifi-available note when disabled" into jb-mr2-dev 2013-05-21 19:54:39 +00:00
Romain Guy
370ab062a0 Avoid extraneous EGL surface allocations 
Bug #8667873

windowShouldResize means we need to layout the window, it doesn't mean
the dimensions of the surface have changed. We should only check the
width and the height. With this fix we can avoid a surface allocation
every time the window shade is opened or closed.

Change-Id: I8afe97b820a865723f2aab7a5aa4ddc8eaaec6e1
 2013-05-21 12:15:07 -07:00
Jeff Brown
cf4339a809 am acad301a: Merge "Update media route picker button assets." into jb-mr2-dev 
* commit 'acad301ae7f7d950aa54526c379d0ca605f180ca':
  Update media route picker button assets.
 2013-05-21 11:39:43 -07:00
Jeff Brown
acad301ae7 Merge "Update media route picker button assets." into jb-mr2-dev 2013-05-21 18:37:07 +00:00