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

122946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
40e61fb7c8 Remove unused line from PhoneWindowManager. 
Change-Id: I2b2dc1f08e32b2731409fcf192712ca0cc269f0a
 2014-02-03 09:44:00 -05:00
Alan Viverette
edc4664d60 Fix broken build in BridgeResources 
Change-Id: Iec58a2acda6b9538bcb5974d3d5c45ea6e53eac5
 2014-02-01 01:43:16 -08:00
Kenny Root
faa1057d4c am aa6ff54e: am 85ee57d1: am c064a1b5: Merge "Remove DRLCertFactory" 
* commit 'aa6ff54ef57936024e98d9f565afe9fff24df2e4':
  Remove DRLCertFactory
 2014-01-31 23:07:24 +00:00
Kenny Root
aa6ff54ef5 am 85ee57d1: am c064a1b5: Merge "Remove DRLCertFactory" 
* commit '85ee57d1ae73db6ac014d76d7be1b5d5e87eb89f':
  Remove DRLCertFactory
 2014-01-31 23:01:15 +00:00
Kenny Root
85ee57d1ae am c064a1b5: Merge "Remove DRLCertFactory" 
* commit 'c064a1b5d9a68bb5513e6ed64a067ab822e98764':
  Remove DRLCertFactory
 2014-01-31 14:58:53 -08:00
Kenny Root
c064a1b5d9 Merge "Remove DRLCertFactory" 2014-01-31 22:54:44 +00:00
Kenny Root
4f2323106b Remove DRLCertFactory 
No longer needed since Conscrypt is the main provider.

Change-Id: Iee741ef376af2de52db79df07e96057438778bc6
 2014-01-31 14:10:15 -08:00
Alan Viverette
c8577b384a Merge "Revert "Cache display lists for Drawables"" 2014-01-31 21:07:51 +00:00
Alan Viverette
fe0ea8c21f Merge "Allow specification of View theme override as a theme attribute" 2014-01-31 21:05:24 +00:00
Alan Viverette
16f1d81d47 Revert "Cache display lists for Drawables" 
This reverts commit c062c7003f34999632fe4ad721dcd47cd71b2159.

Change-Id: I96d4f0482b927101f52140b667f4c38ffc8687f5
 2014-01-31 13:04:38 -08:00
Alan Viverette
14a11eeeff Merge "Simplify GradientDrawable's use of ColorStateList" 2014-01-31 21:01:01 +00:00
Alan Viverette
40df781539 Simplify GradientDrawable's use of ColorStateList 
BUG: 12816352
Change-Id: Icff432ee5d460ca733866185b8bf61fd50248cfc
 2014-01-31 12:58:43 -08:00
John Spurlock
17b79985f4 am 47e276db: am cbd156c1: Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-dev 
* commit '47e276db2a938ca4ff9767cba28062b892e81629':
  Update READ&WRITE_DREAM_STATE to signature|system.
 2014-01-31 20:25:40 +00:00
John Spurlock
47e276db2a am cbd156c1: Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-dev 
* commit 'cbd156c1d574dfe5eced42ec640989ab7de7d5e7':
  Update READ&WRITE_DREAM_STATE to signature|system.
 2014-01-31 20:19:41 +00:00
John Spurlock
cbd156c1d5 Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-dev 2014-01-31 20:17:49 +00:00
Craig Mautner
624e98f539 am d5f1fcb7: am 56bf2f67: Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev 
* commit 'd5f1fcb7a4d6cc11b727bdf79fab7693a5dd7117':
  Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage
 2014-01-31 19:32:18 +00:00
Craig Mautner
d5f1fcb7a4 am 56bf2f67: Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev 
* commit '56bf2f670c800f569fc72102e79fd555b6102677':
  Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage
 2014-01-31 19:26:17 +00:00
Craig Mautner
56bf2f670c Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev 2014-01-31 19:23:36 +00:00
Alan Viverette
8b725dcbe1 Merge "Improve encapsulation of Resources" 2014-01-31 19:22:24 +00:00
Craig Mautner
e1f3fa2482 Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage 
Fixes bug 12592453.

Change-Id: Ib64559727d59b3433c3753f9fda88329effc7e26
 2014-01-31 11:20:40 -08:00
Chris Wren
5c57c44eea Merge "record the notification style" 2014-01-31 19:19:23 +00:00
Alan Viverette
562a6a8d83 Improve encapsulation of Resources 
Change-Id: Ic408915d2695ac8906231da1d2dc127f94bdd0cc
 2014-01-31 11:18:28 -08:00
John Spurlock
4fda2d5ab7 Update READ&WRITE_DREAM_STATE to signature|system. 
Change-Id: Ic3c4c5445384712571e7a1188ed9e2ab6ceb4bde
 2014-01-31 14:14:19 -05:00
Chris Craik
494db9e4bb Merge "Simplify umbra calculation" 2014-01-31 18:57:25 +00:00
Chris Craik
1d89563ff8 Merge "Add initial hidden outline APIs" 2014-01-31 18:56:41 +00:00
Chris Craik
12d9526dd2 Simplify umbra calculation 
Reuse pre-computed values

Change-Id: Ia7725be0ec3ac58af477fcb8de375f5faa05abf4
 2014-01-31 10:43:42 -08:00
Chris Wren
91ad563da3 record the notification style 
Bug: 10634902
Change-Id: I7d29f252367f4ab58e97a6ac8b0c6702f558e5cf
 2014-01-31 12:15:03 -05:00
Narayan Kamath
90b8eaa68b am 797b5adc: am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible" 
* commit '797b5adcb4ead3c687db3d9fd831dff93760dd4a':
  AArch64: Make AssetManager and related classes 64-bit compatible
 2014-01-31 17:12:42 +00:00
Narayan Kamath
8396b56e0a am d49babe5: (-s ours) am 9af95574: am 1cadc07d: Merge "Change ResourceType cookies to int32_t." 
* commit 'd49babe50d61e0264a9f4fbf0b4e182cc56635db':
  Change ResourceType cookies to int32_t.
 2014-01-31 17:12:38 +00:00
Narayan Kamath
fd6a44d0b5 am ff62e966: am 149510e0: am b9f960e0: Merge "Fixed cancel() not working correctly" 
* commit 'ff62e966b60bb20dc7c3384485816b1e7bf06057':
  Fixed cancel() not working correctly
 2014-01-31 16:41:42 +00:00
Igor Murashkin
5ec133b9a0 am ed5d7a6f: am 4463a4ef: am e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" 
* commit 'ed5d7a6f147c75c8af73328bdf816707b58afd90':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-01-31 16:41:38 +00:00
Narayan Kamath
797b5adcb4 am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible" 
* commit '77a1986c69760583f05eabbf7dac7c25dd8b7e7b':
  AArch64: Make AssetManager and related classes 64-bit compatible
 2014-01-31 16:29:23 +00:00
Narayan Kamath
d49babe50d am 9af95574: am 1cadc07d: Merge "Change ResourceType cookies to int32_t." 
* commit '9af955744d4e0d82b61fc99a932b9a5cf28b5df7':
  Change ResourceType cookies to int32_t.
 2014-01-31 16:29:19 +00:00
Narayan Kamath
ff62e966b6 am 149510e0: am b9f960e0: Merge "Fixed cancel() not working correctly" 
* commit '149510e010b46a445355a8d7fcdb8401125b92c3':
  Fixed cancel() not working correctly
 2014-01-31 16:29:16 +00:00
Igor Murashkin
ed5d7a6f14 am 4463a4ef: am e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" 
* commit '4463a4ef26b2eb62fae74568193fd07e97dedd4d':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-01-31 16:29:06 +00:00
George Mount
56f57ccbd4 Revert "Add Path trimming." 
Bug 12489442
This reverts commit 7fe03a267e6edb65142444765ce29ad5ff126052.

Change-Id: Idf434d79683e170364838388c7933a8591f7f4d3
 2014-01-31 07:54:53 -08:00
Narayan Kamath
77a1986c69 am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible" 
* commit '49b7ba4dbc0b4984fc466bb98e9cfa40650db85b':
  AArch64: Make AssetManager and related classes 64-bit compatible
 2014-01-31 07:30:21 -08:00
Narayan Kamath
9af955744d am 1cadc07d: Merge "Change ResourceType cookies to int32_t." 
* commit '1cadc07dd1e3711fb1e57548038e3026682c5ef8':
  Change ResourceType cookies to int32_t.
 2014-01-31 07:30:18 -08:00
Narayan Kamath
149510e010 am b9f960e0: Merge "Fixed cancel() not working correctly" 
* commit 'b9f960e094d53440be5c7e8759a74dbb0ab57317':
  Fixed cancel() not working correctly
 2014-01-31 07:30:15 -08:00
Igor Murashkin
4463a4ef26 am e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" 
* commit 'e05b7b50e234e8ed2471f5ad96bb3d715067e9f3':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-01-31 07:30:12 -08:00
Zhijun He
10586ad2a6 am 4f840dd1: am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer" 
* commit '4f840dd16db41a2d4442667193d57260f84af04a':
  Release locked buffer when it fails to acquire graphics buffer
 2014-01-31 15:12:38 +00:00
Narayan Kamath
b9fd12ac53 am dfd1aa43: resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp 
* commit 'dfd1aa4331b8ab452d7baf4fdf8cf0cd36c67ddd':
  frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
 2014-01-31 15:12:34 +00:00
Narayan Kamath
3a5e470553 am 5cdbac1e: (-s ours) am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder" 
* commit '5cdbac1e44aa85ccfedd19eb1a7376fe84b1ca72':
  AArch64: Use of long for pointers in PropertyValuesHolder
 2014-01-31 15:12:30 +00:00
Narayan Kamath
13701e4822 am 133c9649: am fa2e16e3: am 54190ec8: Merge "change Surface constructor arg to 64bit" 
* commit '133c9649c3c83e6ccefa4f46c162ddb3f55269d0':
  change Surface constructor arg to 64bit
 2014-01-31 15:06:21 +00:00
Narayan Kamath
54b100ceed am 98ac6c79: resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aosp 
* commit '98ac6c79a430e62a886b3a8278694425b5906300':
  Fix a few more delegate methods in layoutlib.
 2014-01-31 15:06:17 +00:00
Nick Kralevich
cb6979acf9 am 643be3ba: am 3dfa15c4: am db3278ab: Merge "Map SELinux log levels to Android log levels." 
* commit '643be3bab19a6305e776721854b293928bf2bfaa':
  Map SELinux log levels to Android log levels.
 2014-01-31 15:06:11 +00:00
Narayan Kamath
49b7ba4dbc Merge "AArch64: Make AssetManager and related classes 64-bit compatible" 2014-01-31 14:35:13 +00:00
Ashok Bhat
896043d67d AArch64: Make AssetManager and related classes 64-bit compatible 
Following changes have been done:

[x] Long is used to store native pointers as pointers can be
    64-bit.

[x] AssetManager openAsset native function returned -1 if
    file name was empty and java function considered any
    non-zero value as success. This has been fixed by native
    function throwing Illegal Argument Exception as well.

[x] AssetManager incRefsLocked and decRefsLocked now accept
    long as input to support 64-bit native references.

[x] AssetManager incRefsLocked method incorrecly used
    'this.hashCode()' instead of the passed parameter id.
    This has been fixed.

[x] Some minor changes have been done to conform with
    standard JNI practice (e.g. use of jint instead of int
    in JNI function prototypes)

Change-Id: I095b9f900d49e51f43ad6afc47cbc23116a6a64a
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
 2014-01-31 14:14:29 +00:00
Narayan Kamath
1cadc07dd1 Merge "Change ResourceType cookies to int32_t." 2014-01-31 14:13:48 +00:00
Narayan Kamath
7c4887f66b Change ResourceType cookies to int32_t. 
Also change the order of parameters in ResTable constructors
to avoid ambiguity.

(cherry picked from commit 00b314436f4fdfada4bbf1e79ec12e9fa38aeaf1)

Change-Id: I874c5d03c134dc3c331fba423b5280366296287c
 2014-01-31 13:47:27 +00:00