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

103929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
220fa85eac am f094d221: Merge "Finish annotating Notification.extras." into jb-mr2-dev 
* commit 'f094d221e53e2359f886ae3d601c490ade70443e':
  Finish annotating Notification.extras.
 2013-04-15 18:42:33 -07:00
Daniel Sandler
f094d221e5 Merge "Finish annotating Notification.extras." into jb-mr2-dev 2013-04-16 01:38:54 +00:00
Jesse Hall
58d80c53c0 Unhide android.opengl.GLES30 class and contents 
Bug: 8566953
Change-Id: I5273fb3bff642da5ff1eecb5899e8051402b19ca
 2013-04-15 17:38:36 -07:00
Jesse Hall
d830e74ff4 Add android.opengl.GLES30, hidden for now 
Bug: 8566953
Change-Id: Ia5a01d5e857b4fce12a451e2dcab0359758ad648
 2013-04-15 17:37:33 -07:00
Kristian Monsen
46dedde94e am 639857f7: Merge "Fix for bug 8607049: Improve javascript dialogs for classic" into jb-mr2-dev 
* commit '639857f7f42bb048b1dd8fbc4849e7b51402f629':
  Fix for bug 8607049: Improve javascript dialogs for classic
 2013-04-15 16:58:53 -07:00
Kristian Monsen
639857f7f4 Merge "Fix for bug 8607049: Improve javascript dialogs for classic" into jb-mr2-dev 2013-04-15 23:54:43 +00:00
Kenny Root
49f0a5df73 resolved conflicts for merge of 6a67a38f to jb-mr2-dev-plus-aosp 2013-04-15 16:40:04 -07:00
David Christie
e8ae4eafea am feedb1b0: Merge "Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently." into jb-mr2-dev 
* commit 'feedb1b095f94e4bd153aeee78da07d963892071':
  Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently.
 2013-04-15 16:39:08 -07:00
David Christie
feedb1b095 Merge "Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently." into jb-mr2-dev 2013-04-15 23:35:44 +00:00
Svetoslav
2602a3974a BinderDied may be called after we unregistered the death recipient. 
It is possible that an accessibility service's package was force stopped
during whose handling the death recipient is unlinked and still get a call
on binderDied since the call was made before we unlink but was waiting on
the lock we held during the force stop handling. Added a check whether the
service is already disconnected and if so do nothing.

bug:8600388

Change-Id: I4a9ca305b9863d986b930a7c1ec8f9006b16a333
 2013-04-15 16:30:12 -07:00
Dianne Hackborn
15717a32c4 am 0985ac04: Merge "Maybe fix issue #8620910: Win_sdk build failed and unable to create..." into jb-mr2-dev 
* commit '0985ac04310f18be7dd814b9a07c93f144ad21c2':
  Maybe fix issue #8620910: Win_sdk build failed and unable to create...
 2013-04-15 16:25:08 -07:00
Dianne Hackborn
f5cfab41c3 am a59a19ab: Merge "Fix issue #8512015: VideoView\'s window animates when its position changes" into jb-mr2-dev 
* commit 'a59a19abb8f284beb478ff2492493251b91a2847':
  Fix issue #8512015: VideoView's window animates when its position changes
 2013-04-15 16:25:05 -07:00
Dianne Hackborn
0985ac0431 Merge "Maybe fix issue #8620910: Win_sdk build failed and unable to create..." into jb-mr2-dev 2013-04-15 23:23:31 +00:00
Dianne Hackborn
a59a19abb8 Merge "Fix issue #8512015: VideoView's window animates when its position changes" into jb-mr2-dev 2013-04-15 23:22:48 +00:00
Alan Viverette
b9f2e99f26 Send tab selection event from ScrollingTabContainerView. 
BUG: 8185409
Change-Id: I37c59906d2950d09e0e39ca91ffad34279dd9526
 2013-04-15 16:16:11 -07:00
Geremy Condra
baa58cdb9f am bffe377b: Merge "Add logic to handle changes to file_contexts during update." into jb-mr2-dev 
* commit 'bffe377bca3cb8240bfc614c12fd1091ae3f69b9':
  Add logic to handle changes to file_contexts during update.
 2013-04-15 16:13:56 -07:00
Geremy Condra
bffe377bca Merge "Add logic to handle changes to file_contexts during update." into jb-mr2-dev 2013-04-15 23:11:12 +00:00
Irfan Sheriff
267b602950 am ed8cdbb7: Merge "Fix CTS failure due to invalid EAP update" into jb-mr2-dev 
* commit 'ed8cdbb780cda3701b433dd1d383bb88f180ff72':
  Fix CTS failure due to invalid EAP update
 2013-04-15 15:57:32 -07:00
Dirk Dougherty
e9cca7eae8 am 9fbc8f70: am edf2ab16: am b345693f: am 5a9c5b67: am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy guidelines documents. 
* commit '9fbc8f70b6ccdecc95c968ecdb9f8f823bd92857':
  Doc change: add policy guidelines documents.
 2013-04-15 15:57:29 -07:00
Irfan Sheriff
ed8cdbb780 Merge "Fix CTS failure due to invalid EAP update" into jb-mr2-dev 2013-04-15 22:52:33 +00:00
Dirk Dougherty
9fbc8f70b6 am edf2ab16: am b345693f: am 5a9c5b67: am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy guidelines documents. 
* commit 'edf2ab16fe011667dbae8c6c351bd3ac36958326':
  Doc change: add policy guidelines documents.
 2013-04-15 15:51:25 -07:00
Dirk Dougherty
edf2ab16fe am b345693f: am 5a9c5b67: am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy guidelines documents. 
* commit 'b345693f0ff0705ba1eedd3b49c21d14dc78c6b6':
  Doc change: add policy guidelines documents.
 2013-04-15 15:47:11 -07:00
Dirk Dougherty
b345693f0f am 5a9c5b67: am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy guidelines documents. 
* commit '5a9c5b67ca6d8c35bb4522bd0618bf50f246f7ef':
  Doc change: add policy guidelines documents.
 2013-04-15 15:44:46 -07:00
Kenny Root
6a67a38f46 Merge "AndroidKeyStore: Add encrypted flag" 2013-04-15 22:44:41 +00:00
Dirk Dougherty
5a9c5b67ca am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy guidelines documents. 
* commit 'b02d529a2faaca629e7c51e4c4ccd7fe34ddb376':
  Doc change: add policy guidelines documents.
 2013-04-15 15:41:56 -07:00
Dirk Dougherty
b02d529a2f am 6859939f: am 99a79e80: Doc change: add policy guidelines documents. 
* commit '6859939fe88de8b42117a3d0798dccb0c594e568':
  Doc change: add policy guidelines documents.
 2013-04-15 15:37:56 -07:00
Dianne Hackborn
c51d050f1b Maybe fix issue #8620910: Win_sdk build failed and unable to create... 
...the sdk platform repo

Change-Id: Ib6cd7c0dfb9b6217ae79af3e2ac25fe0442996e3
 2013-04-15 15:36:53 -07:00
Irfan Sheriff
0b132962e4 Fix CTS failure due to invalid EAP update 
Update EAP only when it has valid entry

Bug: 8604987
Change-Id: Ib6b10bd06c26ee91c4ecd3a231b509d728725dfc
 2013-04-15 22:36:45 +00:00
Dirk Dougherty
6859939fe8 am 99a79e80: Doc change: add policy guidelines documents. 
* commit '99a79e807b4bab154c9904a05d05dda4b420206a':
  Doc change: add policy guidelines documents.
 2013-04-15 15:34:08 -07:00
David Christie
1b9b7b1f1b Fix security issues with LocationManager where apps with coarse permissions 
can get location updates too frequently by repeatedly calling getLastKnownLocation
or by registering/unregistering location updates frequently.

Change-Id: Ibd9ce28b0401372b995a0dbfb2f0a984dd11c0b1
 2013-04-15 15:31:11 -07:00
Kenny Root
4b1042e765 am 2570d0ad: Merge "keystore: remove old APIs" into jb-mr2-dev 
* commit '2570d0ada876b94a91f9665c7469140ba0ddc712':
  keystore: remove old APIs
 2013-04-15 15:30:05 -07:00
Kenny Root
2570d0ada8 Merge "keystore: remove old APIs" into jb-mr2-dev 2013-04-15 22:25:21 +00:00
Chet Haase
face742d31 Avoid repositioning unattached overlay views 
Adding a view to an overlay usually entails removing the
view from its current parent, if it has one. ViewOverlay.add() will
do this automatically. At the same time, it will check to see whether
the parent view is in a different global location than the overlay's
host view, and will adjust the added view accordingly. This enables
the caller to simply toss a view into an overlay and have it end up
at the same global position on the screen.

the problem is that the current code doesn't bother to check whether
the old parent is attached. If that parent has been removed from the
view hierarchy before this overlay operation, then it will show up as
being at (0,0) in the window, not its old location. This results in the
view being mis-positioned in the overaly.

Fix is simple: if the view's old parent is not attached, simply remove
it from that parent before adding it to the overlay; don't try to compensate
for its position which is based on wrong information.

Issue #8620319 Overlay should only use relative window locations for onscreen parents

Change-Id: I414038a6c355dfd58f9766b007ac44d535ef1889
 2013-04-15 15:15:59 -07:00
Dianne Hackborn
1c5383ce0b Fix issue #8512015: VideoView's window animates when its position changes 
Change-Id: I79eee6b9672b7d72eabe5d20be639c05a6f3d72b
 2013-04-15 15:07:21 -07:00
Geremy Condra
f33575b05b Add logic to handle changes to file_contexts during update. 
Bug: 8116902

(cherry picked from commit a2dffda3b3bc4f0bccb175ef4569e45a221d0eb2)

Change-Id: I57c21681d5f94e00d0214fb520ea62af4ea5b025
 2013-04-15 14:56:58 -07:00
Svetoslav
7919ea9866 am 7af3d056: Merge "Crash on non-eng builds due to lacking null check." into jb-mr2-dev 
* commit '7af3d0560d130e877e6ce6a1c830efa7a945d436':
  Crash on non-eng builds due to lacking null check.
 2013-04-15 14:56:24 -07:00
Svetoslav
f9dd9338d0 am 289e6497: Merge "Fully setup newly bound service before state management." into jb-mr2-dev 
* commit '289e64974a3be70ff823ee0a0c1fe5ea32a832bb':
  Fully setup newly bound service before state management.
 2013-04-15 14:56:21 -07:00
Svetoslav
7af3d0560d Merge "Crash on non-eng builds due to lacking null check." into jb-mr2-dev 2013-04-15 21:52:07 +00:00
Svetoslav
289e64974a Merge "Fully setup newly bound service before state management." into jb-mr2-dev 2013-04-15 21:51:22 +00:00
Chris Craik
55b883b0a9 am 30c990c3: Merge "Draw Operation merging" into jb-mr2-dev 
* commit '30c990c361291ad578ef4ffe4a4dd0fd6080797b':
  Draw Operation merging
 2013-04-15 14:31:02 -07:00
Chris Craik
30c990c361 Merge "Draw Operation merging" into jb-mr2-dev 2013-04-15 21:27:11 +00:00
Brian Colonna
df6db6adc2 am 3f1375e5: Merge "Enabling Face Unlock for user switching (bug 8495282)" into jb-mr2-dev 
* commit '3f1375e50fa29c500f1ce746ec7421bf6afcd8ff':
  Enabling Face Unlock for user switching (bug 8495282)
 2013-04-15 14:24:10 -07:00
Brian Colonna
3f1375e50f Merge "Enabling Face Unlock for user switching (bug 8495282)" into jb-mr2-dev 2013-04-15 21:20:08 +00:00
Amith Yamasani
460071f806 am 919e36d5: Merge "Allow non-system apps to use restricted accounts" into jb-mr2-dev 
* commit '919e36d5f689f6a73a879ebd72465f68c1625062':
  Allow non-system apps to use restricted accounts
 2013-04-15 14:02:15 -07:00
Amith Yamasani
919e36d5f6 Merge "Allow non-system apps to use restricted accounts" into jb-mr2-dev 2013-04-15 20:59:50 +00:00
Chris Craik
527a3aace1 Draw Operation merging 
Merge simple bitmap draw operations and text operations to avoid
issuing individual gl draws for each operation. Merging other ops to
be done eventually.

The methods are different - the bitmap merging generates a single
mesh for reused, unclipped images (esp. repeated images in a listview)

The text approach queries just defers the normal font rendering until
the last drawText in the sequence that can share the same shader.

Patches are sorted and merged, but don't yet have a multiDraw
implementation. For now, the pretending-to-merge gives better sorting
behavior by keeping similar patches together.

Change-Id: Ic300cdab0a53814cf7b09c58bf54b1bf0f58ccd6
 2013-04-15 13:53:02 -07:00
Amith Yamasani
e993ae197b Allow non-system apps to use restricted accounts 
Anyway they need to request account access and user will be asked to approve access to the account
at runtime.

Bug: 8617168
Change-Id: I31de852b9bb25f496becc3e6470265b5c330e6ad
 2013-04-15 13:42:57 -07:00
Jeff Tinker
29b5e1701b am 7fa9667f: Merge "Clarify how release of offline keys is handled in the MediaDrm API" into jb-mr2-dev 
* commit '7fa9667f63fe84a2d17ce899121f32bfcec98864':
  Clarify how release of offline keys is handled in the MediaDrm API
 2013-04-15 13:13:39 -07:00
Jeff Tinker
7fa9667f63 Merge "Clarify how release of offline keys is handled in the MediaDrm API" into jb-mr2-dev 2013-04-15 20:11:18 +00:00
Kenny Root
29638ab758 am e4753968: Merge "Remove old KeyStore call sites" into jb-mr2-dev 
* commit 'e47539684e1431a69893e45bcf9ace4f812edbc8':
  Remove old KeyStore call sites
 2013-04-15 13:00:53 -07:00