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

123371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
b1ed19a2ed am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" 
* commit '43c9516a29563131e04ee797562130e2c4f9d54e':
  Fix in MediaMuxer's JNI code
 2014-02-11 16:40:35 +00:00
Narayan Kamath
7f258f970e am a9d171bd: am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ConsumerIrService" 
* commit 'a9d171bd5bab29feaef409489ed23d3c490285ce':
  Use long to store pointers in ConsumerIrService
 2014-02-11 16:40:31 +00:00
Narayan Kamath
a1cffb429c am d350af96: am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument" 
* commit 'd350af9695018e81f85600fb7dd906003cbaf62e':
  Use long for pointers in EmojiFactory and PdfDocument
 2014-02-11 16:40:27 +00:00
Narayan Kamath
43c9516a29 am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" 
* commit '860bba68a1d65534ce6aec6ba8c0b0a736b18ccc':
  Fix in MediaMuxer's JNI code
 2014-02-11 16:34:12 +00:00
Narayan Kamath
a9d171bd5b am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ConsumerIrService" 
* commit '5c770dfba2846ee173d147fd974f8e9f073c1534':
  Use long to store pointers in ConsumerIrService
 2014-02-11 16:34:08 +00:00
Narayan Kamath
d350af9695 am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument" 
* commit 'b90fc64b030ee50bda9a0dabb5247660b70d6659':
  Use long for pointers in EmojiFactory and PdfDocument
 2014-02-11 16:34:04 +00: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
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
3ff18faac2 am deefd1fd: am 5f7c0b1d: am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead of hash_t" 
* commit 'deefd1fdeaf0b538a13219517f8795fdde198e21':
  Fix TinyHashMap to use generic hash_type instead of hash_t
 2014-02-11 14:05:35 +00:00
Narayan Kamath
deefd1fdea am 5f7c0b1d: am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead of hash_t" 
* commit '5f7c0b1d80f883fa15f88e0e4d508576a36a45de':
  Fix TinyHashMap to use generic hash_type instead of hash_t
 2014-02-11 13:47:50 +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
Narayan Kamath
091e8d2aef Fix build. 
com.android.server.SystemServer was no longer imported
on master.

Change-Id: Ie712aa28940953952aa7a99cbb22f74129649249
 2014-02-11 09:40:19 +00:00
Jeff Brown
cab8617b8c am 25df673b: am 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-modular-dev 
* commit '25df673b849de374cf1de40250dfd8a48b7ac28b':
  Make SystemService constructor take a Context.
 2014-02-11 08:33:50 +00:00
Jeff Brown
25df673b84 am 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-modular-dev 
* commit '1b51c9cb96fe2a0818289857a016521eed1ec183':
  Make SystemService constructor take a Context.
 2014-02-11 08:18:34 +00:00
Jeff Brown
1b51c9cb96 Merge "Make SystemService constructor take a Context." into klp-modular-dev 2014-02-11 04:12:02 +00:00
Jeff Brown
b880d880c6 Make SystemService constructor take a Context. 
This change simplifies the process of initializing a SystemService
by folding the onCreate() step back into the constructor.  It removes
some ambuiguity about what work should happen in the constructor and
should make it possible for services to retain most of their final
fields after refactoring into the new pattern.

Change-Id: I25f41af0321bc01898658ab44b369f9c5d16800b
 2014-02-10 20:01:43 -08:00
Craig Mautner
33fa09b1ff am 2d6b55aa: am 312ba86b: Change task removal sequence 
* commit '2d6b55aaa9dd03f7d934f7a192989513b1087357':
  Change task removal sequence
 2014-02-11 02:32:27 +00:00
Craig Mautner
2d6b55aaa9 am 312ba86b: Change task removal sequence 
* commit '312ba86b476fa1d83864a7d465135cc9a4e94ad8':
  Change task removal sequence
 2014-02-11 02:20:15 +00:00
Craig Mautner
312ba86b47 Change task removal sequence 
- Remove task after removing activity. Removing the task before
removing the activity led to problems when the task was still needed.

- In WindowManager wait for activity manager to remove the task.
Previously was automatically removing the task when the last activity
was removed.

Fixes bug 12957434.

Change-Id: I7f6b1f09a2e2a845f177f337769075c9376f8bdb
 2014-02-10 17:55:01 -08:00
Dianne Hackborn
7f477021a1 Merge "Maybe fix issue #12957738: SecurityException in..." 2014-02-11 01:16:11 +00:00
Tim Murray
66ebe94757 am 27f2d46a: (-s ours) am eaf82374: am 38d799fc: Merge "Generic object based data copy." 
* commit '27f2d46a24e840ac5682635dddd0e28dd66172ad':
  Generic object based data copy.
 2014-02-10 23:43:45 +00:00
Tim Murray
27f2d46a24 am eaf82374: am 38d799fc: Merge "Generic object based data copy." 
* commit 'eaf82374186bd7084826f1cd258c82a3c6a4bf29':
  Generic object based data copy.
 2014-02-10 23:34:54 +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
Michael Wright
f52fd37826 Merge "Revert "Move inputservice over to frameworks/native"" 2014-02-10 23:09:45 +00:00
Michael Wright
453fa30ab2 Revert "Move inputservice over to frameworks/native" 
This reverts commit 89e5c7ebb37fabc4368e87e17a502db62598bd61.
 2014-02-10 15:08:26 -08:00
Michael Wright
740dfefcfc Merge "Move inputservice over to frameworks/native" 2014-02-10 22:42:01 +00:00
Michael Wright
943c05f327 Merge "Remove SkRegion dependency from libinput" 2014-02-10 22:41:25 +00:00
Colin Cross
e7755a0d25 am 675d44ad: am 12f1f5b8: am 40545f32: Merge "frameworks/base: fix errors inside ALOGV" 
* commit '675d44ad2355eb4404e286f2c337196297d1e26f':
  frameworks/base: fix errors inside ALOGV
 2014-02-10 22:14:53 +00:00
Michael Wright
89e5c7ebb3 Move inputservice over to frameworks/native 
Remove all of the pieces except the PointerController and SpriteController over
to frameworks/native in preparation for inputflinger. Those two need to stay in
frameworks/base for now because they depend on Skia currently. In the long run
they should be merged into either the InputManager or the WindowManager rather
than as a part of the inputservice / inputflinger.

Change-Id: Iebef71f3030fb3d26a5f338eb66d75bb37c17734
 2014-02-10 14:10:27 -08:00
Colin Cross
675d44ad23 am 12f1f5b8: am 40545f32: Merge "frameworks/base: fix errors inside ALOGV" 
* commit '12f1f5b87326a31f4c69e949a1e645e82c9152d4':
  frameworks/base: fix errors inside ALOGV
 2014-02-10 22:09:12 +00: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
Dianne Hackborn
9358dcca6f Maybe fix issue #12957738: SecurityException in... 
...Multiple Processes: uid 10069 does not have
android.permission.UPDATE_DEVICE_STATS.

Change-Id: Ibabb5b09d52412df8bebdc85a584f89e175b1ec5
 2014-02-10 13:47:39 -08:00
Amith Yamasani
9348ac8249 Fix NPE on removing a user 
Bug: 12957232

Check for null mDeviceOwner.

Change-Id: I107dc24d1a8de121ebd2c1bb56e1af40bb1c55ac
 2014-02-10 13:43:18 -08:00
Michael Wright
a407d6a003 Remove SkRegion dependency from libinput 
This gets us one step closer to removing our dependency on Skia, which is at
least one of the things blocking us from moving the input system out of
f/b.

Change-Id: I755e6267996c93fe700f1056327386923287575a
 2014-02-10 12:59:34 -08:00
John Spurlock
976ed21215 Merge "Fix NPE in PolicyControl." 2014-02-10 20:43:15 +00:00
John Spurlock
b8c37e2507 Fix NPE in PolicyControl. 
Bug:12957738
Change-Id: I8051a7a0656f50ed63321f9a79faf0383d7c66b4
 2014-02-10 15:36:24 -05:00
Leon Scroggins III
3393f390a5 Merge "Decode file descriptor from the correct offset." 2014-02-10 20:30:50 +00:00
Deepanshu Gupta
eaddb84962 am f7193bf8: am d9f9da39: am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement. 
* commit 'f7193bf89780039cf924dd7d1bb67f4830517231':
  Improve text rendering and measurement.
 2014-02-10 20:04:05 +00:00
Deepanshu Gupta
f7193bf897 am d9f9da39: am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement. 
* commit 'd9f9da396b41f394991f676bc74dcfc59c7070a8':
  Improve text rendering and measurement.
 2014-02-10 19:56:58 +00:00
Deepanshu Gupta
d9f9da396b am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement. 
* commit '56b86debcfaf8f661011702d31854bb3804f5fe1':
  Improve text rendering and measurement.
 2014-02-10 19:53:48 +00:00
Deepanshu Gupta
56b86debcf am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement. 
* commit '1c91b1f7a2da5e5b1996217228399ef958c2be0c':
  Improve text rendering and measurement.
 2014-02-10 19:50:58 +00:00
Deepanshu Gupta
1c91b1f7a2 am 45dbfcc7: Improve text rendering and measurement. 
* commit '45dbfcc781a3926d22571b6ccfa3f27ec896f119':
  Improve text rendering and measurement.
 2014-02-10 19:47:20 +00:00