Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119,142 Commits 3 Branches 0 Tags
fd71ddfd4378de331e231fbe22beb92f1efcd196
Commit Graph

45875 Commits

Author SHA1 Message Date
John Spurlock
be878d8773 am b6a4926c: am 647db9fa: am 76ecd66a: am 0196e561: Fix typo in ImageView.java 
* commit 'b6a4926c670244fbf7d7033f2a1b46da25b35d39':
  Fix typo in ImageView.java
 2014-02-03 17:27:11 +00:00
John Spurlock
b6a4926c67 am 647db9fa: am 76ecd66a: am 0196e561: Fix typo in ImageView.java 
* commit '647db9fae37b36d99ce290acfae7b453f00ae5af':
  Fix typo in ImageView.java
 2014-02-03 17:24:05 +00:00
John Spurlock
647db9fae3 am 76ecd66a: am 0196e561: Fix typo in ImageView.java 
* commit '76ecd66a6d5f8ceaebbe9cd109948f01aff4cd27':
  Fix typo in ImageView.java
 2014-02-03 17:21:25 +00:00
John Spurlock
76ecd66a6d am 0196e561: Fix typo in ImageView.java 
* commit '0196e561f280e6cc361442036da277a630e68558':
  Fix typo in ImageView.java
 2014-02-03 17:18:37 +00:00
John Spurlock
0196e561f2 Fix typo in ImageView.java 
Change-Id: Iaa7b020f09c893a5fe006a8523686dd8b9a8f872
 2014-02-03 09:00:35 -05: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
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
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
John Spurlock
4fda2d5ab7 Update READ&WRITE_DREAM_STATE to signature|system. 
Change-Id: Ic3c4c5445384712571e7a1188ed9e2ab6ceb4bde
 2014-01-31 14:14:19 -05: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
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
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
b9f960e094 Merge "Fixed cancel() not working correctly" 2014-01-31 13:20:58 +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
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
Igor Murashkin
e05b7b50e2 Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" 2014-01-31 01:26:15 +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
Brian Carlstrom
c6c633608a frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default 
Bug: 12798969
Change-Id: Ibb7ed86867e4dca53ad7fe33326b08e6f5e664c4
 2014-01-30 13:16:48 -08:00
jl1990
3cd12a5155 Fixed cancel() not working correctly 
The method handleMessage(Message msg) from mHandler variable was
not checking if the timer was cancelled, so
sendMessageDelayed(obtainMessage(MSG), delay) was keeping the
timer alive. The patch simply adds a boolean and checks if the
CountDownTimer was cancelled before calling
sendMessageDelayed(obtainMessage(MSG), delay)

bug: https://code.google.com/p/android/issues/detail?id=58668

Change-Id: Ic6bbb9d33a3616f8503db222513cc14ad2270cb8
Signed-off-by: jl1990 <jlcarrasco1990@gmail.com>
 2014-01-30 13:46:44 +00:00
Narayan Kamath
ab71f8b68f Merge "AArch64: Use of long for pointers in PropertyValuesHolder" 2014-01-30 10:37:12 +00:00
Chong Zhang
b215529c72 change Surface constructor arg to 64bit 
Bug: 12799017
Bug: 12799384

(cherry picked from commit af608e81d4)

Change-Id: I8d1471b16e6a6d334a3a32b789045eb171b81e03
 2014-01-30 09:50:21 +00:00
Stephen Smalley
e0dda3c8e2 Map SELinux log levels to Android log levels. 
Change-Id: I202c543ca6e4110c4011d1904eada4b75b59ff10
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-01-29 12:55:58 -05:00
Narayan Kamath
1a6e29aae5 am d933edc7: am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int." 
* commit 'd933edc742dcaf96862b211f4641e4cfd98acef5':
  mNativeCanvas is long, not int.
 2014-01-29 15:38:42 +00:00
Narayan Kamath
d933edc742 am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int." 
* commit '9ecada44042c49516d781281bbe0cba4e0af51a2':
  mNativeCanvas is long, not int.
 2014-01-29 15:33:48 +00:00
Narayan Kamath
9ecada4404 am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int." 
* commit 'dfd4f5232c87c51fe639b594fd210b4073eca42b':
  mNativeCanvas is long, not int.
 2014-01-29 15:29:23 +00:00
Narayan Kamath
d228a03891 Merge "mNativeCanvas is long, not int." 2014-01-29 15:02:05 +00:00
Narayan Kamath
1caea796c9 am c74f7619: am cdc095ae: am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator" 
* commit 'c74f7619e19f4d172fc0bc6220abc917024c45b0':
  AArch64: Use long for pointers in graphics/Interpolator
 2014-01-29 12:23:45 +00:00
Narayan Kamath
67ac8120bf am 0cc4bb1f: am e4fc5c17: am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture" 
* commit '0cc4bb1ff30a7e2ef96837b1dbe79a89d5145dc2':
  AArch64: Use long for pointers in SurfaceTexture
 2014-01-29 12:23:40 +00:00
Narayan Kamath
e3a6663bb2 mNativeCanvas is long, not int. 
swapNativeCanvas was asking for an int field.

Change-Id: I660fb13ecfb5d3b24201676dc03c16d61c92af07
 2014-01-29 12:21:32 +00:00
Narayan Kamath
c74f7619e1 am cdc095ae: am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator" 
* commit 'cdc095ae4850d9ffd08de0d6e8828949603fcdd1':
  AArch64: Use long for pointers in graphics/Interpolator
 2014-01-29 12:21:21 +00:00
Narayan Kamath
0cc4bb1ff3 am e4fc5c17: am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture" 
* commit 'e4fc5c17c092a77e0647e01e93a6b0e806c27692':
  AArch64: Use long for pointers in SurfaceTexture
 2014-01-29 12:21:11 +00:00
Narayan Kamath
cdc095ae48 am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator" 
* commit '7be33110ea3e1a032ee3aa7c50f1dedf52fcab25':
  AArch64: Use long for pointers in graphics/Interpolator
 2014-01-29 12:18:31 +00:00
Narayan Kamath
e4fc5c17c0 am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture" 
* commit '74db9ddb341d9d7dafe36b2bc74e3aaf50dd3160':
  AArch64: Use long for pointers in SurfaceTexture
 2014-01-29 12:18:27 +00:00
Narayan Kamath
d4ccffd3ba Merge "AArch64: Use long for pointers in graphics/Interpolator" 2014-01-29 12:12:27 +00:00
Narayan Kamath
887b1ca879 Merge "AArch64: Use long for pointers in SurfaceTexture" 2014-01-29 12:12:17 +00:00
Narayan Kamath
4a58714606 am 09d07d0d: am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible" 
* commit '09d07d0d33d44fc87c02a8f607ecb7b96dbb4145':
  AArch64: Make Binder and Parcel 64-bit compatible
 2014-01-29 10:54:26 +00:00
Narayan Kamath
09d07d0d33 am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible" 
* commit 'e3e4b40577032f6fad38bfbeb9c2b40df89f0ef9':
  AArch64: Make Binder and Parcel 64-bit compatible
 2014-01-29 10:51:51 +00:00
Narayan Kamath
e3e4b40577 am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible" 
* commit '9846fb695a3c41aabde4ca0061d583b35f9621d1':
  AArch64: Make Binder and Parcel 64-bit compatible
 2014-01-29 10:48:52 +00:00
Ashok Bhat
0141e88434 AArch64: Use of long for pointers in PropertyValuesHolder 
Long is used in PropertyValuesHolder class to store native pointers
as they can be 64-bit. Note that jmethodID, a pointer to structures,
is also carried in long rather than int to support 64-bit system.

Change-Id: Ifb514fc8473d7c41c0d6194fc6eb85d4816b2cd9
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-01-29 10:47:27 +00:00
Narayan Kamath
50afaefdc0 Merge "AArch64: Make Binder and Parcel 64-bit compatible" 2014-01-29 10:43:23 +00:00
Mark Salyzyn
c0b540dc87 am 8bb5e662: am d732f561: am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db 
* commit '8bb5e66295f4f0f53dce13a877b922dead4639e8':
  jni: Resolve build warnings
  jni: Incorporate liblog reading API
 2014-01-28 21:45:16 +00:00
Mark Salyzyn
8bb5e66295 am d732f561: am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db 
* commit 'd732f561b24e643676812855396d0c9b9138b4c8':
  jni: Resolve build warnings
  jni: Incorporate liblog reading API
 2014-01-28 21:42:07 +00:00
Mark Salyzyn
d732f561b2 am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db 
* commit '2c6b048bed296949878318a7c60faf247f538e67':
  jni: Resolve build warnings
  jni: Incorporate liblog reading API
 2014-01-28 21:38:43 +00:00
Mark Salyzyn
967c5d00df Merge changes I3659193f,I8b78e4db 
* changes:
  jni: Resolve build warnings
  jni: Incorporate liblog reading API
 2014-01-28 21:30:40 +00:00