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

158998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
3476a2a0b2 am 564ec716: Merge "Track change to Conscrypt" 
* commit '564ec716f4ac2f71d7d4e6eb481075603e183b4f':
  Track change to Conscrypt
 2014-11-26 17:13:48 +00:00
Kenny Root
564ec716f4 Merge "Track change to Conscrypt" 2014-11-26 17:09:40 +00:00
Kenny Root
9d2d6b6b4b Track change to Conscrypt 
Change-Id: I8814fd0720acf09332927f184fdd9b2cdac4f413
 2014-11-26 09:08:40 -08:00
Narayan Kamath
edda97c9ff am fdbef408: Merge "Start MountService before performBootDexOpt" 
* commit 'fdbef4081d715de59525d58d44881b00f616616f':
  Start MountService before performBootDexOpt
 2014-11-26 11:05:46 +00:00
Narayan Kamath
fdbef4081d Merge "Start MountService before performBootDexOpt" 2014-11-26 10:59:29 +00:00
Chris Craik
bf62d3070c am af5bd75b: Merge "Enable stencil clipping within clearLayerRegions" 
* commit 'af5bd75b3d65fc710784f59d1c22c164312e2691':
  Enable stencil clipping within clearLayerRegions
 2014-11-26 00:02:17 +00:00
Chris Craik
af5bd75b3d Merge "Enable stencil clipping within clearLayerRegions" 2014-11-25 23:56:33 +00:00
Elliott Hughes
f67cc14998 am 2657717f: Merge "We have POSIX clocks." 
* commit '2657717f97e0de689aa3d8cae75bb0053607839d':
  We have POSIX clocks.
 2014-11-25 23:23:45 +00:00
Elliott Hughes
2657717f97 Merge "We have POSIX clocks." 2014-11-25 23:17:59 +00:00
Elliott Hughes
42c569224a We have POSIX clocks. 
Change-Id: I70f82074f8c14a26c4ed7eb912ddf6d7da44c168
 2014-11-25 15:11:59 -08:00
chh
3ec380d365 am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters" 
* commit 'fc54573373ff965aa40cccdc1ab11c1c880c8930':
  Remove unused variables and functions, don't warn about unused parameters
 2014-11-25 00:41:06 +00:00
chh
fc54573373 Merge "Remove unused variables and functions, don't warn about unused parameters" 2014-11-25 00:37:12 +00:00
Chih-hung Hsieh
43ea037b4c am 481c4b64: Merge "Fix class vs. struct mismatch" 
* commit '481c4b641ea7d210396f16478c486cabf51db879':
  Fix class vs. struct mismatch
 2014-11-25 00:24:23 +00:00
Chih-hung Hsieh
481c4b641e Merge "Fix class vs. struct mismatch" 2014-11-25 00:20:03 +00:00
Bernhard Rosenkränzer
99d61edfda Fix class vs. struct mismatch 
Don't refer to classes as structs and view versa -- causes warnings in
clang (in code built with -Werror)

Change-Id: I4d7f461bcf6fe4e43a14ad2f28ee0e0ddea95abc
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-24 16:18:15 -08:00
Chih-hung Hsieh
6cc39a475d am 613d2066: Merge "Fix unused variables." 
* commit '613d20668a28f9dc970949c9efd2ca7f61bed6f4':
  Fix unused variables.
 2014-11-25 00:00:22 +00:00
Chih-hung Hsieh
613d20668a Merge "Fix unused variables." 2014-11-24 23:53:36 +00:00
Bernhard Rosenkränzer
9c1c90e92e Fix unused variables. 
The return value of jniRegisterNativeMethods is checked only in
LOG_FATAL_IF, which defines to nothing in the LOG_NDEBUG
case.

Fake a use of the 'res' variable to shut off warnings when LOG_NDEBUG.

Change-Id: I8263610f327c56897f76796fe1fbc2b325b0559f
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-24 15:42:11 -08:00
Chih-hung Hsieh
73780ac392 am 38cc84de: Merge "Remove unused variable" 
* commit '38cc84deceaf7bc9fab898cbcb37523cfba2bb66':
  Remove unused variable
 2014-11-24 22:20:34 +00:00
Chih-hung Hsieh
38cc84dece Merge "Remove unused variable" 2014-11-24 22:15:42 +00:00
Chih-Hung Hsieh
a3b1ea3336 am e57b3991: Merge "Remove unused function" 
* commit 'e57b3991d85f22597014d74b64805a081cc978e0':
  Remove unused function
 2014-11-24 20:20:21 +00:00
Chih-Hung Hsieh
e57b3991d8 Merge "Remove unused function" 2014-11-24 20:15:13 +00:00
Chih-Hung Hsieh
70363cc576 Remove unused function 
Remove an unused static function clang complains about

Change-Id: Id5875960e9f93348c7a3a912f42b5f457af2cdc0
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-24 11:52:43 -08:00
Narayan Kamath
98b8fe747a am 32ed090f: Merge "Stop using DATE_FORMAT from settings." 
* commit '32ed090f5af4d533660759664f2542b99dbda7d9':
  Stop using DATE_FORMAT from settings.
 2014-11-24 16:19:31 +00:00
Narayan Kamath
68e9af7ba0 am 1d84709c: Merge "Stop reading Settings.System.DATE_FORMAT." 
* commit '1d84709cf4d320a3e57cd16db144262b1fc2c3d7':
  Stop reading Settings.System.DATE_FORMAT.
 2014-11-24 16:15:13 +00:00
Narayan Kamath
32ed090f5a Merge "Stop using DATE_FORMAT from settings." 2014-11-24 16:14:33 +00:00
Narayan Kamath
1d84709cf4 Merge "Stop reading Settings.System.DATE_FORMAT." 2014-11-24 16:10:02 +00:00
Narayan Kamath
f91f06a599 Stop reading Settings.System.DATE_FORMAT. 
Also, move over DateFormat.getInstance(SHORT) instead of
LocaleData.shortDateFormat4 (which forces 4 digit years).
Based on an analysis of git history, there seems to be no
real motiviation for using 4 digit years.

If anyone in the platform complains loudly, we could look at
using a skeleton pattern instead of just replacing 'y' with 'yy'.

If third party apps are affected, we could add a targetSdkversion
based check and revert to the old behaviour for older targetSdks.

bug: 18388178
bug: 18322220
Change-Id: Ieab2b41691958a2e668d382c5a6b3d9aaf741ed2
 2014-11-24 16:05:19 +00:00
Dohyun Lee
adc0d9da86 Enable stencil clipping within clearLayerRegions 
Previously stencil clipping within clearLayerRegions is disabled by commit
62d307c2402777d5e53b4590af5f32f8c55afd81. However, clearing whole layer
regions causes black-colored triangle regions when a TextView has
RotateAnimation because the draw within clearLayerRegions does not
affected by the current stencil clip.

Change-Id: Id32a0b16754b109905f833e063ebfa156bd953f2
Signed-off-by: Dohyun Lee <dohyun.lee@lge.com>
 2014-11-24 21:08:15 +09:00
Bernhard Rosenkränzer
4048a4bcb1 Remove unused variables and functions, don't warn about unused parameters 
Remove unused variables and static functions clang complains about,
disable warnings about unused parameters (needed for clang and for gcc
with -Wextra enabled)

Change-Id: I76a22cd0158b3c7375c54e3d4d15bc1ac448591e
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-23 22:24:32 +01:00
Elliott Hughes
08e2fd7238 am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN." 
* commit 'ff4dd15cd024f72cbd2b6d547356de030b2dd71c':
  We HAVE_LITTLE_ENDIAN.
 2014-11-22 07:50:58 +00:00
Elliott Hughes
ff4dd15cd0 Merge "We HAVE_LITTLE_ENDIAN." 2014-11-22 07:47:27 +00:00
Elliott Hughes
9d074a1fb7 We HAVE_LITTLE_ENDIAN. 
Change-Id: I5b5d0ef3f91fe84d629d2ddac436bd22019edfd4
 2014-11-21 23:36:45 -08:00
Olawale Ogunwale
50884b5b65 am f1058308: Merge "Add window to child window list with correct order" 
* commit 'f1058308c62f297c5bca9e9baf8451efeb200805':
  Add window to child window list with correct order
 2014-11-22 02:34:01 +00:00
Olawale Ogunwale
f1058308c6 Merge "Add window to child window list with correct order" 2014-11-22 02:12:49 +00:00
Chih-hung Hsieh
05f7c39eb4 am fc4a7538: Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"" 
* commit 'fc4a7538a65449428e9d321deb6a413e19461c6c':
  Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"
 2014-11-22 00:31:07 +00:00
Chih-hung Hsieh
fc4a7538a6 Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"" 2014-11-22 00:24:39 +00:00
John Reck
39a57cc20e am ad938797: Merge "Revert "Frameworks/base: Unused parameters in hwui"" 
* commit 'ad9387974b02528ff0366134a3740d66fb0b1cd5':
  Revert "Frameworks/base: Unused parameters in hwui"
 2014-11-22 00:14:53 +00:00
John Reck
ad9387974b Merge "Revert "Frameworks/base: Unused parameters in hwui"" 2014-11-22 00:10:45 +00:00
John Reck
8b59a528b5 Revert "Frameworks/base: Unused parameters in hwui" 
This reverts commit 42ddc18d108f789705ad4eb697ce9599ad322507.

Change-Id: I3574a936a39a96314db6437d0a1eb58d260d893d
 2014-11-22 00:10:02 +00:00
Andreas Gampe
99377df12e am d2738ead: Merge "Frameworks/base: Unused parameters in hwui" 
* commit 'd2738eadc1f8c92c64d47429ef3f168738431809':
  Frameworks/base: Unused parameters in hwui
 2014-11-21 21:38:42 +00:00
Andreas Gampe
d2738eadc1 Merge "Frameworks/base: Unused parameters in hwui" 2014-11-21 21:34:46 +00:00
Alan Viverette
e606a7884d am 0218970a: Merge "Fix error overwriting when restoring error" 
* commit '0218970afaeefcabf7ed4b476cb93f28d61847b8':
  Fix error overwriting when restoring error
 2014-11-21 20:45:15 +00:00
Alan Viverette
e442e904ae am 47172f53: Merge "Use parseColor instead of getHTMLColor" 
* commit '47172f53659e4e98988dab99a4155653b638b1e5':
  Use parseColor instead of getHTMLColor
 2014-11-21 20:45:09 +00:00
Alan Viverette
0218970afa Merge "Fix error overwriting when restoring error" 2014-11-21 20:40:30 +00:00
Alan Viverette
47172f5365 Merge "Use parseColor instead of getHTMLColor" 2014-11-21 20:40:08 +00:00
Chih-hung Hsieh
9ebffb40d8 Revert "Frameworks/base: Mask Skia warning in GraphicsJNI" 
Should be unnecessary after c/115476.
This reverts commit ba823cee8bafff98640408a777fe105a72fcea0d.

Change-Id: I3ef4d3e04805e450038d469d9672dc064f729b0f
 2014-11-21 18:54:15 +00:00
Andreas Gampe
42ddc18d10 Frameworks/base: Unused parameters in hwui 
Remove Clang cutout for unused parameters. Fix warnings.

Remove Clang cutout for deprecated Skia function usage. Has been
fixed in the L push.

Change-Id: I7ea073ff67127cc1e14e798b655e2c50615fe8e7
 2014-11-21 10:39:21 -08:00
Andreas Gampe
3fc5e3cabf am 2c596a53: Merge "Frameworks/base: Consistency in core/jni" 
* commit '2c596a533488320444e28bbe37b7032589a0c5dd':
  Frameworks/base: Consistency in core/jni
 2014-11-21 18:22:36 +00:00
Andreas Gampe
2c596a5334 Merge "Frameworks/base: Consistency in core/jni" 2014-11-21 18:18:36 +00:00