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

103570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Dixon
a9b3334688 am f38b070b: Merge "Hide PlusinsEnabled/PluginsPath methods" into jb-mr2-dev 
* commit 'f38b070b31269e974298ec9e644814bcc2663c91':
  Hide PlusinsEnabled/PluginsPath methods
 2013-04-09 13:15:27 -07:00
Jonathan Dixon
f38b070b31 Merge "Hide PlusinsEnabled/PluginsPath methods" into jb-mr2-dev 2013-04-09 20:09:29 +00:00
Jamie Gennis
f9c7d6bc15 Add APIs for application-generated systrace events 
This change adds new APIs to enable applications to generate custom Systrace
begin/end events.  Application-generated events use the ATRACE_APP_TAG tag,
which is enabled only if either the application has declared itself debuggable
in its manifest or ro.debuggable is set to 1 on the device.

Change-Id: I311d09e2e6ed1a30f5ffa84907f250e11cc0d48d
 2013-04-09 11:59:43 -07:00
Robert Greenwalt
979ee3cca3 Routing workaround. 
Change our order of operations so that secondary route table
adds succeed.  Working to understand the why of this too.
bug:8361314

Change-Id: Ie25061eb38c62eaa5e60aa8a488496de49bdbd9d
 2013-04-09 11:22:56 -07:00
Robert Greenwalt
273703935d am dbf500aa: Merge "Turn back on global proxy support." into jb-mr2-dev 
* commit 'dbf500aaafd0889aa3ac9bf0fb2b2be4e0c3ebbf':
  Turn back on global proxy support.
 2013-04-09 11:19:34 -07:00
Robert Greenwalt
dbf500aaaf Merge "Turn back on global proxy support." into jb-mr2-dev 2013-04-09 18:15:06 +00:00
Scott Main
92bc5d5c7d am b4c13c4b: am 405c6e2d: am d3724e02: am 2568d7f0: am 0bf013fd: am f417fc4a: fix xml error in sample 
* commit 'b4c13c4b045f4d96c377ba1fb9d834c111412a8c':
  fix xml error in sample
 2013-04-09 10:53:13 -07:00
Scott Main
b4c13c4b04 am 405c6e2d: am d3724e02: am 2568d7f0: am 0bf013fd: am f417fc4a: fix xml error in sample 
* commit '405c6e2d656b628262ff3e3d0b79f58a46c839ec':
  fix xml error in sample
 2013-04-09 10:50:29 -07:00
Scott Main
405c6e2d65 am d3724e02: am 2568d7f0: am 0bf013fd: am f417fc4a: fix xml error in sample 
* commit 'd3724e02d898b66a5b94cf0f2d3bbfaec5295b32':
  fix xml error in sample
 2013-04-09 10:47:50 -07:00
Scott Main
d3724e02d8 am 2568d7f0: am 0bf013fd: am f417fc4a: fix xml error in sample 
* commit '2568d7f0cb9ee568309a0347805a12b9e771b689':
  fix xml error in sample
 2013-04-09 10:43:38 -07:00
Dianne Hackborn
e9b4ee692c am 558a3c1b: Merge "Kill processes when permissions are revoked." into jb-mr2-dev 
* commit '558a3c1b7b40eb9356f8c4446ca63af8cf16bd91':
  Kill processes when permissions are revoked.
 2013-04-09 10:42:09 -07:00
Scott Main
2568d7f0cb am 0bf013fd: am f417fc4a: fix xml error in sample 
* commit '0bf013fdbd11a18c010147aed5899034172feb9a':
  fix xml error in sample
 2013-04-09 10:41:03 -07:00
Baligh Uddin
0e45086dff am 5660b484: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '5660b4843ed1471b3b5318b77367dda7960596a1':
  Import translations. DO NOT MERGE
 2013-04-09 10:38:37 -07:00
Scott Main
0bf013fdbd am f417fc4a: fix xml error in sample 
* commit 'f417fc4a4f6aa577e0af08776825aa4569638f51':
  fix xml error in sample
 2013-04-09 10:38:18 -07:00
Dianne Hackborn
558a3c1b7b Merge "Kill processes when permissions are revoked." into jb-mr2-dev 2013-04-09 17:38:00 +00:00
Baligh Uddin
5660b4843e Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-09 17:34:24 +00:00
Scott Main
f417fc4a4f fix xml error in sample 
Change-Id: I59ca15028c52e0be081f4e65308f88e06115f7fd
 2013-04-09 10:29:00 -07:00
Raph Levien
d2773b5cf8 am 37605412: Merge "Update Droid Serif" into jb-mr2-dev 
* commit '376054121edc62e88b2e3f69ce3397fac557bc64':
  Update Droid Serif
 2013-04-09 10:14:58 -07:00
Romain Guy
032d47af73 Change the dither texture's swizzling 
This is a more elegant way to sample from a float alpha texture.
Instead of sampling from the red channel in the fragment shader
we can set the alpha channel swizzle to redirect it to the
red channel. This lets us sample from the alpha channel in the
fragment shader and get the correct value.

Change-Id: I95bbf7a82964e1bf42c0fee1b782b6bdbbcef618
 2013-04-09 10:12:47 -07:00
Raph Levien
376054121e Merge "Update Droid Serif" into jb-mr2-dev 2013-04-09 17:10:56 +00:00
Daniel Sandler
800d99f6b5 am 9fa49cc3: Merge "Fix [-] buttons in the notification builder test." into jb-mr2-dev 
* commit '9fa49cc3308f6af593d780581121afc3c1d7e046':
  Fix [-] buttons in the notification builder test.
 2013-04-09 07:40:22 -07:00
Daniel Sandler
9fa49cc330 Merge "Fix [-] buttons in the notification builder test." into jb-mr2-dev 2013-04-09 14:34:20 +00:00
Daniel Sandler
72dcb91393 Fix [-] buttons in the notification builder test. 
(Broken by change I9fae5a4a).

Bug: 8564511
Change-Id: I0d5b65e6678018630c812c5616e9b3f068029e66
 2013-04-09 13:34:04 +00:00
The Android Automerger
446250cc4b merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-09 05:55:37 -07:00
Michael Jurka
7449844f69 am 104ca45a: Merge "Fix janky icon fade-in animation in Recents" into jb-mr2-dev 
* commit '104ca45a046cf6f056d84799f6a161c8befe7522':
  Fix janky icon fade-in animation in Recents
 2013-04-08 23:10:14 -07:00
Michael Jurka
104ca45a04 Merge "Fix janky icon fade-in animation in Recents" into jb-mr2-dev 2013-04-09 06:04:36 +00:00
Dianne Hackborn
f1b782427f Kill processes when permissions are revoked. 
Some permissions are associated with gids, so we need to
kill any running processes if their permission is revoked.
We will do this for any permission being revoked, since
the association between gids and permissions can change
over time.

Change-Id: Ieb7408e032539c4f21eb089d65a7a7e6c289f010
 2013-04-08 22:28:59 -07:00
Michael Wright
74c8fb601e Stop marking gamepads as keyboards 
Change-Id: I0ba49aa3235b2e0a50405cf6d68632e268fe4183
 2013-04-08 20:05:32 -07:00
Ying Wang
d9574cb128 am cf5ccb8f: Fix tests build. 
* commit 'cf5ccb8f81f038112e13ce2c9ff73602005595f7':
  Fix tests build.
 2013-04-08 19:05:04 -07:00
Ying Wang
cf5ccb8f81 Fix tests build. 
Change-Id: I24d65c18018a8d6df6fa3414306fc0d586d4cfa2
 2013-04-08 19:02:01 -07:00
Eric Rowe
ffd6c490e6 Change dropbox tag for native crashes. 
Change-Id: Id2738fc758c3d144e5fdd2c7f1c8617dad129338
 2013-04-08 18:56:02 -07:00
Kenny Root
c86d5e7dca Check outInfo is not null 
Only call keystore if outInfo is not null

Bug: 8568820
Change-Id: I24ab625ad02b8510da489911064453de642b6748
 2013-04-08 18:55:53 -07:00
Michael Jurka
e0523f7c80 Fix janky icon fade-in animation in Recents 
Change-Id: I15d2274add8903820dac3da0fa47c9e54f6ec97d
 2013-04-08 18:20:20 -07:00
Robert Greenwalt
4b8fabd5a8 Fix crash bug with mismatched iface names 
The copied-to LinkProperties needs the same iface name as the copied from.
Since we were copying into an empty LP this was trivial, but I
changed the params to tighten up this contract - don't want to
accidentally change an LP's iface name when we shouldn't.

bug:8569797
Change-Id: I5f88826e37271a0549c14d004bb2f16983b950e6
 2013-04-08 18:02:02 -07:00
Eric Rowe
fa67c5ada2 am 3c09715c: Merge "Change dropbox tag for native crashes." into jb-mr2-dev 
* commit '3c09715cedc737cc6e36c201d9f9188c3615e9a5':
  Change dropbox tag for native crashes.
 2013-04-08 17:15:33 -07:00
Eric Rowe
3c09715ced Merge "Change dropbox tag for native crashes." into jb-mr2-dev 2013-04-09 00:11:51 +00:00
Jeff Brown
9acc8c9c53 am 97b968b6: Merge "Fix trackball interpretation of precision." into jb-mr2-dev 
* commit '97b968b6b3baf40e8cfd5ff147f81cd81398638a':
  Fix trackball interpretation of precision.
 2013-04-08 17:03:22 -07:00
Jeff Brown
21dffd5d11 am 3a2854bc: Merge "Queues, queues, queues and input." into jb-mr2-dev 
* commit '3a2854bcee08e3af3ca1b042c1fef6ca68f8c70a':
  Queues, queues, queues and input.
 2013-04-08 17:03:20 -07:00
Jeff Brown
97b968b6b3 Merge "Fix trackball interpretation of precision." into jb-mr2-dev 2013-04-09 00:00:38 +00:00
Jeff Brown
3a2854bcee Merge "Queues, queues, queues and input." into jb-mr2-dev 2013-04-08 23:59:24 +00:00
Jeff Brown
c574b68cbb Fix trackball interpretation of precision. 
The trackball to dpad synthesis was using the MotionEvent's precision
field to determine a threshold for movement but the calculations
involved did not actually make sense for any value of precision
less than 2.0.  This worked fine before since the InputReader
hardcodes the trackball's precision to 6.

Injected trackball events may have a different precision which can
result in the thresholds being set inappropriately.  For example,
it was not possible to move focus by one unit at a time when
the precision was set to 1.0.

The old code was probably using precision as a way to set a
threshold based on the trackball moving by some minimum number
of physical ticks, in this case 2.  But the code will work just
as well if we set an absolute threshold based on distance
traveled given that the input system is already expected to
normalize the trackball movements before delivering them to the
application.

So stop using precision.

Bug: 8473020
Change-Id: I3c6f7fb1b507f8cf5608b47550e7345fea3352fa
 2013-04-08 16:53:59 -07:00
Marco Nelissen
d563cede5c am c4ad3cb0: Merge "Add support for common encryption" into jb-mr2-dev 
* commit 'c4ad3cb07ed76c5697c60285456d9c49675174d9':
  Add support for common encryption
 2013-04-08 16:42:17 -07:00
Marco Nelissen
c4ad3cb07e Merge "Add support for common encryption" into jb-mr2-dev 2013-04-08 23:39:29 +00:00
Jonathan Dixon
0bf4781ece Hide PlusinsEnabled/PluginsPath methods 
These have been deprecated since API level 8 / 9. Plugins are deprecated
overall now, so there's no requirement for apps to call these any more.

Change-Id: I1a27557644238477df00979f9badc9aab0a526c6
 2013-04-08 16:37:38 -07:00
Robert Greenwalt
00e8d4c1b6 Turn back on global proxy support. 
This reverts 138626.

Bug:8557674
Change-Id: I7b117d313c424d75bdeeea507541a96342f256f0
 2013-04-08 16:31:26 -07:00
Kenny Root
b3be67ce34 am 0eee410e: Merge "Check outInfo is not null" into jb-mr2-dev 
* commit '0eee410e473c1546af80c63ec866655a28833f33':
  Check outInfo is not null
 2013-04-08 16:16:44 -07:00
Kenny Root
0eee410e47 Merge "Check outInfo is not null" into jb-mr2-dev 2013-04-08 23:10:50 +00:00
Kenny Root
3b9933d0c2 Check outInfo is not null 
Only call keystore if outInfo is not null

Bug: 8568820
Change-Id: I24ab625ad02b8510da489911064453de642b6748
 2013-04-08 16:06:24 -07:00
Michael Wright
b74df06f9c am 605994d6: Merge "Fix off by one in ListView\'s upward focus traversal" into jb-mr2-dev 
* commit '605994d6703c1856c4fad397e5b99d299fc80075':
  Fix off by one in ListView's upward focus traversal
 2013-04-08 16:01:01 -07:00
Chet Haase
15c9e15e71 am b9604a34: Merge "Amend getOverlay() docs for SurfaceView/TextureView" into jb-mr2-dev 
* commit 'b9604a34ab2afd52b675769ae737ee0dba875393':
  Amend getOverlay() docs for SurfaceView/TextureView
 2013-04-08 15:57:29 -07:00