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

3194 Commits

Author SHA1 Message Date
John Reck
7ab73f1e98 am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev 
automerge: 76f24bd

* commit '76f24bde7816dd97ed2375ec41c9817be0330d9f':
  Surface:lockHardwareCanvas
 2014-10-21 23:34:46 +00:00
John Reck
76f24bde78 am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev 
* commit 'e73a54f33c029552469fcf1cda46eed2f360a38e':
  Surface:lockHardwareCanvas
 2014-10-21 21:39:36 +00:00
John Reck
bb2d0cc7e1 Surface:lockHardwareCanvas 
Bug: 17440886

Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
 2014-10-21 13:23:56 -07:00
ztenghui
6189bdd883 am 6a7335ac: am 3406be85: am 5237c0c3: Merge "Support negative value in exponential data in the pathData." into lmp-mr1-dev 
* commit '6a7335acd862babb40435f678348e3e651d77c89':
  Support negative value in exponential data in the pathData.
 2014-10-10 22:08:02 +00:00
Sandeep Siddhartha
2d1cd5b20b am f9c45add: am a591efe2: am dbc9aa2c: am eecf74bc: am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'f9c45addceed8d98f5a9a8a7486e91e4980b1fec':
  Add tests for model management [SDK Only]
 2014-10-10 22:06:43 +00:00
ztenghui
6a7335acd8 am 3406be85: am 5237c0c3: Merge "Support negative value in exponential data in the pathData." into lmp-mr1-dev 
* commit '3406be853d21af58d551adbde805706f43ef51e2':
  Support negative value in exponential data in the pathData.
 2014-10-10 20:12:06 +00:00
ztenghui
5237c0c3c9 Merge "Support negative value in exponential data in the pathData." into lmp-mr1-dev 2014-10-10 19:59:23 +00:00
ztenghui
846d53c1d5 am 39af6ae0: am a92dd37f: am e6411c76: Merge "Support dot separation as the svg path data did." into lmp-mr1-dev 
* commit '39af6ae064399ad58023752732ed2d388e897736':
  Support dot separation as the svg path data did.
 2014-10-10 18:39:43 +00:00
ztenghui
897f6daeff Support negative value in exponential data in the pathData. 
Now "1e-5" will not be separated as "1e" and "-5".

Add one test for this use case.
Make sure we print out the pathData when path parsing has error.

b/17919923

Change-Id: I10a00ce21166cfb5a009c49c1a93f40eeb956d83
 2014-10-10 11:11:34 -07:00
Sandeep Siddhartha
f9c45addce am a591efe2: am dbc9aa2c: am eecf74bc: am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'a591efe2839d45fe40928e97bf8c3c8c16e6ac82':
  Add tests for model management [SDK Only]
 2014-10-10 17:14:23 +00:00
ztenghui
39af6ae064 am a92dd37f: am e6411c76: Merge "Support dot separation as the svg path data did." into lmp-mr1-dev 
* commit 'a92dd37feb28923c1633b85d12382bc2aa2e03da':
  Support dot separation as the svg path data did.
 2014-10-10 16:57:03 +00:00
Sandeep Siddhartha
dbc9aa2c7c am eecf74bc: am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'eecf74bcf7746c20f4b8cf69448e4b292357026d':
  Add tests for model management [SDK Only]
 2014-10-10 00:30:18 +00:00
Sandeep Siddhartha
f49c37d0b9 am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'ed65c63bdc4a4413da5195f7e5fa392ce72f6135':
  Add tests for model management [SDK Only]
 2014-10-09 17:57:53 +00:00
Sandeep Siddhartha
ed65c63bdc Merge "Add tests for model management [SDK Only]" into lmp-dev 2014-10-09 17:54:16 +00:00
ztenghui
e6411c76c4 Merge "Support dot separation as the svg path data did." into lmp-mr1-dev 2014-10-09 16:34:40 +00:00
ztenghui
4cc3e2704a Support dot separation as the svg path data did. 
Like "0.0.0" will be separated to "0.0 .0" now, just to make sure we are more
complied with svg path data.

b/17892882

Change-Id: Id7b64e9882f5174aa794a0256e2a29d66c724876
 2014-10-08 15:51:37 -07:00
Adam Lesinski
5959304e58 am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit '1a98dd5cc7ea89793208b51983198bfbeade5ccc':
  Load shared library dependencies for AppWidgets
 2014-10-07 20:47:19 +00:00
Adam Lesinski
ee437a6915 am d6353c8c: am 5166be90: am 18ab83e5: am f189c445: am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit 'd6353c8c0ee7f4a16c129df90679e734f735b4c9':
  Load shared library dependencies for AppWidgets
 2014-10-07 20:41:11 +00:00
Adam Lesinski
d6353c8c0e am 5166be90: am 18ab83e5: am f189c445: am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit '5166be9007b65728e0c55e88ef4d25417a8157ce':
  Load shared library dependencies for AppWidgets
 2014-10-07 20:34:50 +00:00
Adam Lesinski
18ab83e571 am f189c445: am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit 'f189c445b84365a3f1bd2b678fdca37f9df8d5d1':
  Load shared library dependencies for AppWidgets
 2014-10-07 20:03:24 +00:00
Adam Lesinski
1a98dd5cc7 Merge "Load shared library dependencies for AppWidgets" into lmp-dev 2014-10-07 19:51:17 +00:00
Adam Lesinski
d00bb5edcf Load shared library dependencies for AppWidgets 
PackageManager and AppWidgetHostServiceImpl should
be loading the resources of any shared libraries being
used by the app, as they have references in their Widgets
or application icons/labels, etc.

Bug:17668152
Change-Id: I359662334edb125d7570089916727df4eeba02bb
 2014-10-07 12:14:45 -07:00
Sandeep Siddhartha
b585ac5b5e Add tests for model management [SDK Only] 
This doesn't change any functionality/APIs etc.
It allows us to launch the activity and manually test the enrollment
methods.

Bug: 17885286
Change-Id: I506d9bb98a592131c04a50c9d6224164ffe07183
 2014-10-07 11:24:51 -07:00
Dianne Hackborn
22dbaddf58 am 8b718b80: am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '8b718b80e0caf179a174f8417fe4f5b875297de6':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:43:58 +00:00
Dianne Hackborn
8b718b80e0 am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit 'db75703b261e1d1446cca210d7dcafa3279c31bc':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:39:50 +00:00
Dianne Hackborn
2f577e83cb am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '90d557b7a68e64e049a44560b76b959ef87f13d7':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:22:53 +00:00
Dianne Hackborn
2131b18542 am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '7f7d240b13b96b617e298c6178af0425308f5ef9':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 18:58:57 +00:00
Dianne Hackborn
2d7576b082 Fix issue #17752399: Multiple apps broken by GET_TASKS permission change 
Keep around GET_TASKS as a permission available to apps, so apps still
think they have it and don't get all uppity because they don't.

Add a new REAL_GET_TASKS that is the actual permission now.

Plus some temporary compatibility code until everyone can transition
fromn GET_TASKS to REAL_GET_TASKS.

Change-Id: I12c1102eed24844685dcbd2fa3b612811603958f
 2014-10-03 16:26:04 -07:00
Neil Fuller
ebf2e8b451 am c2a0b448: resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp 
* commit 'c2a0b4482d7144e8382346ea4c22c7b89368fec0':
  Switch from FloatMath -> Math and Math.hypot where possible
 2014-10-02 13:39:55 +00:00
Neil Fuller
c2a0b4482d resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp 
Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7
 2014-10-02 14:32:37 +01:00
wsmlby
81c4c81576 am d8e94409: am 49049aef: am 2e7aa675: am 489502cf: am 7e1ae00c: Merge "Throw error when no intent can be found" into lmp-dev 
* commit 'd8e94409e031e97ba5aa966f2e7e97fd6bb43e32':
  Throw error when no intent can be found
 2014-10-02 12:53:11 +00:00
Adam Powell
29e2e5d2d5 am e18d68d6: am 4e789dbf: am 8628387c: am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev 
* commit 'e18d68d6ab2f5354441162719ec87cb57de83519':
  Revert "Fix issue with using locally defined attrs in a shared lib"
 2014-10-02 12:52:38 +00:00
ztenghui
2777d4b713 am 043c4b35: am 51ec33bb: am 2298938c: Merge "More test cases from UX team for AVD." into lmp-mr1-dev 
* commit '043c4b35026a733058d01e159fa3c9259a16e766':
  More test cases from UX team for AVD.
 2014-10-02 12:52:16 +00:00
Neil Fuller
f7cf5d43aa resolved conflicts for merge of ee665151 to lmp-dev-plus-aosp 
Change-Id: I97671e62de26919e391dbb2686511584c59ab990
 2014-10-02 11:48:08 +01:00
wsmlby
2e7aa67585 am 489502cf: am 7e1ae00c: Merge "Throw error when no intent can be found" into lmp-dev 
* commit '489502cf606b12cc0f872cec6dfd18d0e41db93f':
  Throw error when no intent can be found
 2014-10-01 22:18:13 +00:00
Adam Powell
8628387c60 am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev 
* commit 'b226d2951c8641f9851e40b4e13b4ae25cb1a482':
  Revert "Fix issue with using locally defined attrs in a shared lib"
 2014-10-01 22:15:56 +00:00
ztenghui
2298938cef Merge "More test cases from UX team for AVD." into lmp-mr1-dev 2014-10-01 21:10:57 +00:00
wsmlby
6bd30ee1a2 Throw error when no intent can be found 
bug: 17396762

Change-Id: I10502d5d1e2332d9e6820ee645234c125e937b7a
 2014-10-01 20:57:55 +00:00
Adam Powell
908c748096 Revert "Fix issue with using locally defined attrs in a shared lib" 
This reverts commit 5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6.

The reverted commit caused issues loading resources supplied by static libraries.

Bug 17748356

Change-Id: I860a4f31451ee7c03c02974826472a67226b029f
 2014-10-01 18:11:18 +00:00
Adam Lesinski
8cb387b3b7 am 7923da5f: am 06f380e9: am 95731abe: am bb7b5197: am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev 
* commit '7923da5f5d05f256179e0d926b3b55bbf1d29a8e':
  Fix issue with using locally defined attrs in a shared lib
 2014-10-01 17:19:30 +00:00
Neil Fuller
33253a4baa Switch from FloatMath -> Math and Math.hypot where possible 
The motivation is an API change: FloatMath is going to be
deprecated and/or removed. Performance is not the goal of
this change.

That said...

Math is faster than FloatMath with AOT compilation.

While making the change, occurances of:

{Float}Math.sqrt(x * x + y * y) and
{Float}Math.sqrt({Float}Math.pow(x, 2) + {Float}Math.pow(y, 2))

have been replaced with:

{(float)} Math.hypot(x, y)

Right now there is no runtime intrinsic for hypot so is not faster
in all cases for AOT compilation:

Math.sqrt(x * x + y * y) is faster than Math.hypot(x, y) with
AOT, but all other combinations of FloatMath, use of pow() etc.
are slower than hypot().

hypot() has the advantage of being self documenting and
could be optimized in future. None of the behavior differences
around NaN and rounding appear to be important for the cases
looked at: they all assume results and arguments are in range
and usually the results are cast to float.

Different implementations measured on hammerhead / L:

AOT compiled:

[FloatMath.hypot(x, y)]
benchmark=Hypot_FloatMathHypot} 633.85 ns; σ=0.32 ns @ 3 trials

[FloatMath.sqrt(x*x + y*y)]
benchmark=Hypot_FloatMathSqrtMult} 684.17 ns; σ=4.83 ns @ 3 trials

[FloatMath.sqrt(FloatMath.pow(x, 2) + FloatMath.pow(y, 2))]
benchmark=Hypot_FloatMathSqrtPow} 1270.65 ns; σ=12.20 ns @ 6 trials

[(float) Math.hypot(x, y)]
benchmark=Hypot_MathHypot} 96.80 ns; σ=0.05 ns @ 3 trials

[(float) Math.sqrt(x*x + y*y)]
benchmark=Hypot_MathSqrtMult} 23.97 ns; σ=0.01 ns @ 3 trials

[(float) Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2))]
benchmark=Hypot_MathSqrtPow} 156.19 ns; σ=0.12 ns @ 3 trials

Interpreter:

benchmark=Hypot_FloatMathHypot} 1180.54 ns; σ=5.13 ns @ 3 trials
benchmark=Hypot_FloatMathSqrtMult} 1121.05 ns; σ=3.80 ns @ 3 trials
benchmark=Hypot_FloatMathSqrtPow} 3327.14 ns; σ=7.33 ns @ 3 trials
benchmark=Hypot_MathHypot} 856.57 ns; σ=1.41 ns @ 3 trials
benchmark=Hypot_MathSqrtMult} 1028.92 ns; σ=9.11 ns @ 3 trials
benchmark=Hypot_MathSqrtPow} 2539.47 ns; σ=24.44 ns @ 3 trials

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I06c91f682095e627cb547d60d936ef87941be692
 2014-10-01 14:04:15 +01:00
ztenghui
6eafdfcd1c More test cases from UX team for AVD. 
This adds more realistic avds for testing purpose.
Also add root level alpha tests.

b/17698712

Change-Id: I32efaecf8a46a110c77e432a5307296e8a443160
 2014-09-30 17:24:05 -07:00
Adam Lesinski
5069dd6989 Fix issue with using locally defined attrs in a shared lib 
The attribute name resource IDs were never fixed up with
the runtime package ID so we weren't finding attributes
whenever the runtime package ID was different than the build
time one, which happened to be when a shared lib referenced itself
(0x00 vs 0x02).

Bug:17666947
Change-Id: Icf3e874bcea0e27eebe42d60fbed626a34bf9266
 2014-09-30 16:18:09 -07:00
RoboErik
4932877113 am 00cbb751: am 5e8f023d: am a59c7f03: am dff59b8b: am 23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev 
* commit '00cbb751533bf683480ba80f0c450c59c6ca96a1':
  Allow null queues to be set in MediaSession
 2014-09-26 15:25:55 +00:00
RoboErik
df26651ff4 Merge "Allow null queues to be set in MediaSession" into lmp-dev 2014-09-25 18:28:21 +00:00
ztenghui
f06355712a am e7b9e3c6: am 72e1f678: am 0ecbcd00: am 64816d53: am a00457a6: Merge "Add one more test and update old tests" into lmp-dev 
* commit 'e7b9e3c6a36f0f88b345204249c0848cc4cfb2d9':
  Add one more test and update old tests
 2014-09-25 17:18:26 +00:00
ztenghui
9d23862bfd Merge "Add one more test and update old tests" into lmp-dev 2014-09-24 23:07:35 +00:00
RoboErik
03fce072ca Allow null queues to be set in MediaSession 
Also add some test code for it to OneMedia.

bug:17593962
Change-Id: I074e2bb0329d9a97f623e4309bb7dada157b8324
 2014-09-24 14:35:32 -07:00
Dianne Hackborn
0e3ba836c8 am 1dbd1440: am 2129bb01: am 657bd7ec: am fa3089f8: am 0d18d08d: Merge "Work on issue #17628623: Need to update default preferred activities for YouTube" into lmp-dev 
* commit '1dbd14405618f8645a9873c5d904bad549197edb':
  Work on issue #17628623: Need to update default preferred activities for YouTube
 2014-09-24 17:17:42 +00:00
Dianne Hackborn
58817f502c Merge "Work on issue #17628623: Need to update default preferred activities for YouTube" into lmp-dev 2014-09-24 01:00:03 +00:00