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

123106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Narayan Kamath
acda961446 Merge "Change ResourceType cookies to int32_t." 2014-01-31 13:46:08 +00:00
Narayan Kamath
b9f960e094 Merge "Fixed cancel() not working correctly" 2014-01-31 13:20:58 +00:00
Zhijun He
4f840dd16d am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer" 
* commit '5901ddeb525ed7691c382e8d17f47055d7d1e5db':
  Release locked buffer when it fails to acquire graphics buffer
 2014-01-31 13:00:35 +00:00
Narayan Kamath
dfd1aa4331 resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp 
Change-Id: Ia28df1c1aa084959ed9289bfe90e7f6a4bffb8a2
 2014-01-31 12:57:24 +00:00
Narayan Kamath
5cdbac1e44 am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder" 
* commit '70986e197bbaf4de4f8126519a75df2b057c3b52':
  AArch64: Use of long for pointers in PropertyValuesHolder
 2014-01-31 12:17:09 +00:00
Narayan Kamath
133c9649c3 am fa2e16e3: am 54190ec8: Merge "change Surface constructor arg to 64bit" 
* commit 'fa2e16e36d95d5cf0848a28a98ac4566321fc119':
  change Surface constructor arg to 64bit
 2014-01-31 12:17:05 +00:00
Narayan Kamath
98ac6c79a4 resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aosp 
Change-Id: I2fc48fb4bd779042fc9bc00e6c8aca876d4a5f0b
 2014-01-31 12:08:17 +00:00
Nick Kralevich
643be3bab1 am 3dfa15c4: am db3278ab: Merge "Map SELinux log levels to Android log levels." 
* commit '3dfa15c49b4c78cdf3bf1af79e9b307596455708':
  Map SELinux log levels to Android log levels.
 2014-01-31 10:26:32 +00:00
Scott Main
ca821336bd am 53959634: am 40a7e3c4: am e71cc6fd: am 897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs 
* commit '53959634b35ab75ef40ac4514d50bae2de9425ac':
  Revert "add Cast to the sidenav"
 2014-01-31 08:12:30 +00:00
Scott Main
8d1a52c832 am a749593d: am 04022e50: am 4b1a317a: am 428ccea5: Merge "Revert "add google cast feature page"" into klp-docs 
* commit 'a749593dd64f6d8f8d5d5e6addd16699258e9130':
  Revert "add google cast feature page"
 2014-01-31 08:12:25 +00:00
Quddus Chong
5e5d04b468 am 7ce575a5: am bcf8faa6: am f29e2589: am 583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs 
* commit '7ce575a5257328ce089d6eaa39eb493eafbd473c':
  Revert "docs: Added API reference docs for GCore Iberico release."
 2014-01-31 08:12:20 +00:00
Hui Lu
945d69d7b8 am 3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev 
* commit '3cab7fc1b8f06166df3a58cf10d4a0db36bde788':
  Add proxy as another network.
 2014-01-31 08:11:57 +00:00
Stephen Hines
7f75eaa218 Add message to RS docs about application vs. library packaging. 
Change-Id: I49b694629ded066e5ee9c1af29970c59cb637fdd
 2014-01-30 19:43:20 -08:00
Igor Murashkin
e05b7b50e2 Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" 2014-01-31 01:26:15 +00:00
George Mount
d085625976 Merge "Add PathInterpolator to interpolate along a Path." 2014-01-31 00:53:20 +00:00
George Mount
6e5f045ddf Add PathInterpolator to interpolate along a Path. 
Change-Id: I45b361ef8edd49b5e22d66ba9e25600065e0d5e7
 2014-01-30 16:50:15 -08:00
Brian Carlstrom
a76be8ba7a Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default" 2014-01-31 00:21:16 +00:00
Chris Craik
a2fe7affd3 Add initial hidden outline APIs 
Background drawable outline usage and drawable outline calculation
still to come.

Change-Id: I8c7539f1638f86e1f8eb11f4fe49f705f61d58ba
 2014-01-30 16:04:16 -08:00
Brian Carlstrom
fdb98d4770 frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default 
(cherry picked from commit c6c633608ad4cd77ed21227b0bdb11eb79797c31)

Bug: 12798969
Change-Id: Ibb7ed86867e4dca53ad7fe33326b08e6f5e664c4
 2014-01-30 15:56:37 -08:00
Scott Main
53959634b3 am 40a7e3c4: am e71cc6fd: am 897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs 
* commit '40a7e3c425120661c305999f7c2bdd76d3240b7d':
  Revert "add Cast to the sidenav"
 2014-01-30 23:25:08 +00:00
Scott Main
a749593dd6 am 04022e50: am 4b1a317a: am 428ccea5: Merge "Revert "add google cast feature page"" into klp-docs 
* commit '04022e50774c02ff0a7757c5464486af021fd108':
  Revert "add google cast feature page"
 2014-01-30 23:25:02 +00:00
Quddus Chong
7ce575a525 am bcf8faa6: am f29e2589: am 583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs 
* commit 'bcf8faa6c79bde5b9580057238e447165ac9d329':
  Revert "docs: Added API reference docs for GCore Iberico release."
 2014-01-30 23:24:54 +00:00
John Reck
3040f73541 Merge "Fix nano vs. millis" 2014-01-30 23:16:10 +00:00
Zhijun He
5901ddeb52 am 0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer" 
* commit '0a1b64fe79f41eec5cebe8434ab30d93e2ea2724':
  Release locked buffer when it fails to acquire graphics buffer
 2014-01-30 15:03:30 -08:00
Zhijun He
0a1b64fe79 Merge "Release locked buffer when it fails to acquire graphics buffer" 2014-01-30 23:01:21 +00:00
Hui Lu
3cab7fc1b8 Merge "Add proxy as another network." into klp-modular-dev 2014-01-30 22:58:48 +00:00
Hui Lu
1c5624a012 Add proxy as another network. 
Change-Id: I70cb6ac5604c4f0d6a752a291c40de2445ae98bb
 2014-01-30 17:26:18 -05:00
Fabrice Di Meglio
d95dc28f8e Merge "Make public but hide OnPreferenceTreeClickListener" 2014-01-30 22:17:16 +00:00
Fabrice Di Meglio
25da1bac82 Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216)" 2014-01-30 22:15:07 +00:00
Brian Carlstrom
2cd0563cb8 am 3038046b: Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default" 
* commit '3038046b23540ccf4ca80f181386a77cf64d5e27':
  frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
 2014-01-30 14:11:02 -08:00
Scott Main
40a7e3c425 am e71cc6fd: am 897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs 
* commit 'e71cc6fd82df1bf654d72e796ac7975dbf0aff29':
  Revert "add Cast to the sidenav"
 2014-01-30 22:10:50 +00:00
Scott Main
04022e5077 am 4b1a317a: am 428ccea5: Merge "Revert "add google cast feature page"" into klp-docs 
* commit '4b1a317abb56dc90efacf86ccd796643b1f02478':
  Revert "add google cast feature page"
 2014-01-30 22:10:45 +00:00
Scott Main
e71cc6fd82 am 897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs 
* commit '897739f1b7d179cd402fcf907e2ac9751fe44c6d':
  Revert "add Cast to the sidenav"
 2014-01-30 21:52:15 +00:00
Scott Main
4b1a317abb am 428ccea5: Merge "Revert "add google cast feature page"" into klp-docs 
* commit '428ccea5090d3a88d6af898cd90b52df4062101f':
  Revert "add google cast feature page"
 2014-01-30 21:52:11 +00:00
Brian Carlstrom
3038046b23 Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default" 2014-01-30 21:50:58 +00:00
Patrick Tjin
ca7d380fb8 Merge "Formatting fix" 2014-01-30 21:46:53 +00:00
Andy McFadden
acdbb9a9e1 Merge "Allow "opaque" flag to be updated" 2014-01-30 21:41:38 +00:00
Patrick Tjin
31068163b6 Formatting fix 
Remove whitespace from end of Sync Status table

Change-Id: I5b0bf3380e0c67c769ec9c334f1374713c94aa94
 2014-01-30 13:28:46 -08:00
Scott Main
897739f1b7 Merge "Revert "add Cast to the sidenav"" into klp-docs 2014-01-30 21:27:26 +00:00
Scott Main
1ff3e4fffc Revert "add Cast to the sidenav" 
This reverts commit 3781318fefba28699e7713b231c9591bf29eadac.

Change-Id: Iacefcd9a9d1f678d7a16f2bcdaac4c6cc90a475d
 2014-01-30 21:27:06 +00:00
Scott Main
428ccea509 Merge "Revert "add google cast feature page"" into klp-docs 2014-01-30 21:24:45 +00:00
Scott Main
eae9f4675e Revert "add google cast feature page" 
This reverts commit cf010ab9c5df8896c57a722137ac3b4306ef1ca5.

Change-Id: I87197ce3c4f65ae8899bbf081cb4c0e84e4f1684
 2014-01-30 21:24:25 +00:00