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

124868 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qiwen Zhao
6ec42ac6b7 Merge branch 'master-nova' of persistent-https://googleplex-android.googlesource.com/platform/frameworks/base into master-nova 2014-02-11 10:26:37 -08:00
Qiwen Zhao
dc8d416578 Merge commit 'f6eebb21' into master-nova 
Conflicts:
	core/java/android/view/GLES20Layer.java
	core/jni/android_view_GLES20Canvas.cpp
 2014-02-11 10:25:59 -08:00
Narayan Kamath
912524f9dc am faa91f85: am 86fb9904: am 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes" 
* commit 'faa91f852e9526b2f112122da9ae0956526cf662':
  Use long to store pointers in GLES_JNI/EGL classes
 2014-02-11 09:49:11 -08:00
Narayan Kamath
f488e8c0a4 am b1ed19a2: am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" 
* commit 'b1ed19a2ed1739c0d415cc81a3b7c458307694ab':
  Fix in MediaMuxer's JNI code
 2014-02-11 09:49:08 -08:00
Narayan Kamath
dfc99fe251 am 7f258f97: am a9d171bd: am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ConsumerIrService" 
* commit '7f258f970e2123131638665c9d6674a7e1c7e4ea':
  Use long to store pointers in ConsumerIrService
 2014-02-11 09:49:05 -08:00
Narayan Kamath
2a602688fb am a1cffb42: am d350af96: am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument" 
* commit 'a1cffb429c57eb961282160ae4631d70bfa55204':
  Use long for pointers in EmojiFactory and PdfDocument
 2014-02-11 09:49:02 -08:00
Narayan Kamath
8ef475779c am 3ff18faa: am deefd1fd: am 5f7c0b1d: am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead of hash_t" 
* commit '3ff18faac21553f027cdb1ff4a98447f333750bd':
  Fix TinyHashMap to use generic hash_type instead of hash_t
 2014-02-11 09:48:59 -08:00
Narayan Kamath
fadc6655a5 am 091e8d2a: Fix build. 
* commit '091e8d2aefe39cec85f64d74898354fff596735c':
  Fix build.
 2014-02-11 09:48:54 -08:00
Jeff Brown
e7895a9676 am cab8617b: am 25df673b: am 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-modular-dev 
* commit 'cab8617b8ccea3a99b1ee15e15915c512a10c738':
  Make SystemService constructor take a Context.
 2014-02-11 09:48:51 -08:00
Craig Mautner
1a7d56f319 am 33fa09b1: am 2d6b55aa: am 312ba86b: Change task removal sequence 
* commit '33fa09b1ffe8d14d146de4b2632103d831ff8988':
  Change task removal sequence
 2014-02-11 09:48:50 -08:00
Craig Mautner
cc69d4c778 Don't remove Activities and Tasks until animation done 
Just like stacks and displays, activities and tasks need to stick
around until animations have completed.

Change-Id: I54fe8f6855d60cbc3a25cbc6e762defd5ac50bf5
 2014-02-11 09:47:31 -08:00
John Reck
f6eebb21d5 Merge "Refactor HardwareLayer" 2014-02-11 17:30:53 +00:00
Narayan Kamath
faa91f852e am 86fb9904: am 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes" 
* commit '86fb9904ad5760cb957782b45e96054c01fe4200':
  Use long to store pointers in GLES_JNI/EGL classes
 2014-02-11 16:40:39 +00:00
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
86fb9904ad am 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes" 
* commit '8a63c34bb0f0cf25051c6eeb49c21476258fadfb':
  Use long to store pointers in GLES_JNI/EGL classes
 2014-02-11 16:34:16 +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
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
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
John Reck
04fc583c3d Refactor HardwareLayer 
Defer all the things!
 Groundwork to allow hardware layers to work in a renderthread world

Change-Id: Ib3aa47525f393083621254a743dbaa6352f933bd
 2014-02-10 20:55:39 -08: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
Dianne Hackborn
156e7e60f3 am 7f477021: Merge "Maybe fix issue #12957738: SecurityException in..." 
* commit '7f477021a1887fd5681d92b3575310125d2ffa90':
  Maybe fix issue #12957738: SecurityException in...
 2014-02-10 18:17:56 -08: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
Qiwen Zhao
588f34a92d reset to master for rs/java/android/renderscript 2014-02-10 17:33:32 -08:00
Qiwen Zhao
c996f44a0b reset back to previous master-nova at sha1 cd0318f6f41de8fd70e873840c78340f388199c9 with history 2014-02-10 17:32:25 -08:00
Dianne Hackborn
7f477021a1 Merge "Maybe fix issue #12957738: SecurityException in..." 2014-02-11 01:16:11 +00:00
Qiwen Zhao
a58bacd11f reset to master @66ebe94 with history 2014-02-10 16:56:07 -08: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