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

117982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
16c0b295ef am bba3a694: Merge "Telephony API extension v2" 
* commit 'bba3a694b8400fd340c0400bf42ef3d79a4285b1':
  Telephony API extension v2
 2014-02-12 20:29:01 -08:00
Wink Saville
bba3a694b8 Merge "Telephony API extension v2" 2014-02-13 04:26:33 +00:00
Nick Kralevich
93994e9db4 am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 
* commit 'a9bb594da6aff97ba927ba67a34486d0b9c1b4a0':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
 2014-02-12 15:12:08 -08:00
Nick Kralevich
a9bb594da6 Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 2014-02-12 23:09:37 +00:00
Dave Platt
53c7608aef am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem" 
* commit 'a3c3533b1d6a4016cd1856fccac6cc404997b8a6':
  Finish fixing Zygote descriptor leakage problem
 2014-02-12 15:07:07 -08:00
Dave Platt
a3c3533b1d Merge "Finish fixing Zygote descriptor leakage problem" 2014-02-12 23:03:48 +00:00
Narayan Kamath
8fa3f44342 am 54e7f53f: Merge "Fix build." 
* commit '54e7f53fce25366781840a124aa018534c4eb52b':
  Fix build.
 2014-02-12 09:29:55 -08:00
Narayan Kamath
54e7f53fce Merge "Fix build." 2014-02-12 17:26:58 +00:00
Paul Duffin
75d67c6aa0 am d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays" 
* commit 'd562a9b5160b491a9cc884f72651e46d786bdc0a':
  Improve Parcel's handling of non-primitive arrays
 2014-02-12 02:29:41 -08:00
Paul Duffin
d562a9b516 Merge "Improve Parcel's handling of non-primitive arrays" 2014-02-12 10:27:14 +00:00
Dianne Hackborn
4385d37813 Fix build. 
At least part of what is broken.  Other stuff still seems to be.

(cherry picked from 32bb5fae353b5bb6275e75952e89c514c7369cee)

Change-Id: I280376645166fe772ff7a31ff2e8494dce2adbf8
 2014-02-12 10:11:34 +00:00
Narayan Kamath
aa98fb51a8 am f991771f: Merge "Use size_t* in AssetManager::createIdmap" 
* commit 'f991771f81953f5d355eb905d05a784ed7287016':
  Use size_t* in AssetManager::createIdmap
 2014-02-12 01:40:24 -08:00
Narayan Kamath
f991771f81 Merge "Use size_t* in AssetManager::createIdmap" 2014-02-12 09:32:17 +00:00
Colin Cross
ecbeae74f2 Use size_t* in AssetManager::createIdmap 
ResTable::createIdmap takes a size_t*, and the idmap command is
passing in a size_t*, make AssetManager::createIdmap take a
size_t*.  Should fix the mac build.

Change-Id: Idc16dedfe2aa7367c75f89a937a8242d494e8f8e
 2014-02-11 18:02:06 -08:00
Dianne Hackborn
133f6826e5 am 89492190: Merge "Runtime resource overlay, iteration 2, test cases" 
* commit '89492190b39e301d8203d0a9a9f6b11120c16ecb':
  Runtime resource overlay, iteration 2, test cases
 2014-02-11 13:34:49 -08:00
Dianne Hackborn
4ad93639d2 am 67754d93: Merge "Runtime resource overlay, iteration 2" 
* commit '67754d93c4bfb2da1831b1dd2b40c12a838b1028':
  Runtime resource overlay, iteration 2
 2014-02-11 13:34:46 -08:00
Dianne Hackborn
89492190b3 Merge "Runtime resource overlay, iteration 2, test cases" 2014-02-11 21:30:08 +00:00
Dianne Hackborn
67754d93c4 Merge "Runtime resource overlay, iteration 2" 2014-02-11 21:29:58 +00:00
Dianne Hackborn
0cd115e1ce am 578087e3: Merge "New command line tool \'idmap\'" 
* commit '578087e39845a0c9a728ba18963f498d1f69b279':
  New command line tool 'idmap'
 2014-02-11 12:32:17 -08:00
Dianne Hackborn
578087e398 Merge "New command line tool 'idmap'" 2014-02-11 20:30:08 +00:00
Paul Duffin
ac5a0828c1 Improve Parcel's handling of non-primitive arrays 
Treat arrays other than actual Object arrays (i.e. those whose component type
is actually Object) and the primitive arrays already handled specially by
Parcel as Serializable's.

Issue: 64583
Change-Id: I3ff797f3262e77e4de27f35709bceee5410d1ed4
 2014-02-11 16:49:25 +00:00
Narayan Kamath
8a63c34bb0 am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes" 
* commit '3aeb629d8251699237e3d067be4fb44ba206626c':
  Use long to store pointers in GLES_JNI/EGL classes
 2014-02-11 08:30:28 -08:00
Narayan Kamath
860bba68a1 am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" 
* commit '7b7726b7982063034667c6a6076cc0b390ede8ce':
  Fix in MediaMuxer's JNI code
 2014-02-11 08:30:25 -08:00
Narayan Kamath
5c770dfba2 am b823bd45: Merge "Use long to store pointers in ConsumerIrService" 
* commit 'b823bd45600fc339ae2e618d5fe506ace74ada4a':
  Use long to store pointers in ConsumerIrService
 2014-02-11 08:30:20 -08:00
Narayan Kamath
b90fc64b03 am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument" 
* commit 'f44a3f1e00e38b09f70efed3eaf771871435e478':
  Use long for pointers in EmojiFactory and PdfDocument
 2014-02-11 08:30:06 -08:00
Narayan Kamath
3aeb629d82 Merge "Use long to store pointers in GLES_JNI/EGL classes" 2014-02-11 15:39:04 +00:00
Narayan Kamath
7b7726b798 Merge "Fix in MediaMuxer's JNI code" 2014-02-11 14:33:38 +00:00
Narayan Kamath
b823bd4560 Merge "Use long to store pointers in ConsumerIrService" 2014-02-11 14:29:09 +00:00
Narayan Kamath
f44a3f1e00 Merge "Use long for pointers in EmojiFactory and PdfDocument" 2014-02-11 14:07:17 +00:00
Narayan Kamath
5f7c0b1d80 am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead of hash_t" 
* commit '6d8b21a84c92904a966d77f3c6c0282e92c2b077':
  Fix TinyHashMap to use generic hash_type instead of hash_t
 2014-02-11 05:44:37 -08:00
Narayan Kamath
6d8b21a84c Merge "Fix TinyHashMap to use generic hash_type instead of hash_t" 2014-02-11 13:40:38 +00:00
Tim Murray
eaf8237418 am 38d799fc: Merge "Generic object based data copy." 
* commit '38d799fc7a272c3c6ff7b9bc7b7f9239b45bf98c':
  Generic object based data copy.
 2014-02-10 15:29:55 -08:00
Tim Murray
38d799fc7a Merge "Generic object based data copy." 2014-02-10 23:27:06 +00:00
Jason Sams
1136bb91b4 Generic object based data copy. 
This change consolidates the copy paths to Object based.
The runtime now uses reflection to identify the type of
array present.  This adds support for long/double and reduces
the amount of code present.  We could also support arrays of vectors
or objects in the future with this mechanism.

Change-Id: I2297c1c01fbe6a64c375d6368f25d7db781ea788
 2014-02-10 15:18:56 -08:00
Colin Cross
12f1f5b873 am 40545f32: Merge "frameworks/base: fix errors inside ALOGV" 
* commit '40545f32d3364604dac0c21a0310c26f7596e3a8':
  frameworks/base: fix errors inside ALOGV
 2014-02-10 14:06:09 -08:00
Colin Cross
40545f32d3 Merge "frameworks/base: fix errors inside ALOGV" 2014-02-10 22:02:50 +00:00
Narayan Kamath
578d4f5f50 am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code" 
* commit '56062983f1e07295c812fba0e22ce579a35b6f76':
  AArch64: Use long for pointers in RS Java/JNI code
 2014-02-10 05:37:18 -08:00
Narayan Kamath
56062983f1 Merge "AArch64: Use long for pointers in RS Java/JNI code" 2014-02-10 13:33:26 +00:00
Colin Cross
d06969518b frameworks/base: fix errors inside ALOGV 
Fix errors exposed by adding compile-time checking to disabled ALOGVs.

Change-Id: I9beeb5d5df498c63d6bed49734ee80a8e0afcefc
 2014-02-09 21:54:01 -08:00
Christopher Tate
379bb6ed4e am ff27e6bc: Merge "Use canonical path for /vendor/app" 
* commit 'ff27e6bc44097485abfde24f396399e5eec9ff6d':
  Use canonical path for /vendor/app
 2014-02-07 15:33:17 -08:00
Christopher Tate
ff27e6bc44 Merge "Use canonical path for /vendor/app" 2014-02-07 23:30:24 +00:00
John Spurlock
6691bfd646 am cccae25f: Merge "Example controller app for system ui demo mode." 
* commit 'cccae25fc7cd3daf68dee3d3ca7665a5ea12f097':
  Example controller app for system ui demo mode.
 2014-02-07 13:01:42 -08:00
John Spurlock
cccae25fc7 Merge "Example controller app for system ui demo mode." 2014-02-07 20:58:37 +00:00
John Spurlock
c23929c3a3 Example controller app for system ui demo mode. 
Demo mode is protected behind a system setting.  To enable:
$ adb shell settings put global sysui_demo_allowed 1

Change-Id: I2248e27a253bf9eac176e8be9153a2b147cefa40
 2014-02-07 14:47:47 -05:00
Jean-Luc Brouillet
8067c9ec87 am 11e6cabc: Merge "Fix a typo." 
* commit '11e6cabc66a5ecfc9dadbd68fc0a5ed7d2a4656d':
  Fix a typo.
 2014-02-07 11:11:28 -08:00
Ashok Bhat
e9bea2a182 Fix TinyHashMap to use generic hash_type instead of hash_t 
TinyHashMap used hash_t(key) to generate hashcode. This
would not work for 64-bit pointers as hash_t is declared as
an uint32_t.

Replaced the hash_t(key) call to more generic android::hash_type(key).
This function is a template function declared in TypeHelpers.h and
has a version available for all data types including pointers.

Change-Id: I612cf18b49ca7c30b63f9d6938df68fed7d80d08
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-02-07 19:10:04 +00:00
Jean-Luc Brouillet
11e6cabc66 Merge "Fix a typo." 2014-02-07 19:08:36 +00:00
Jean-Luc Brouillet
d60799ec84 Fix a typo. 
Change-Id: I770fe97ab0635de84d15393aca6bca57552f2f10
 2014-02-07 11:04:26 -08:00
Ashok Bhat
0d552f7d8b Use long to store pointers in ConsumerIrService 
Change-Id: I4e6562b7dc09f87ad80b1e862b614a370d37feb5
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-02-07 18:12:23 +00:00
Ashok Bhat
d2507a2f3c Fix in MediaMuxer's JNI code 
android_media_MediaMuxer_native_setup should return jlong. It was
incorrectly returning jint.

Change-Id: I31a475af0818f4d5dcbb39380b42612188cf3853
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-02-07 18:10:22 +00:00