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

124941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Katie McCormick
0a96a82bbe am 0cb2c76b: Merge "Doc update: clarify best practices." into klp-docs 
* commit '0cb2c76b66bb7c413221fc0c5ea07b7779c97dea':
  Doc update: clarify best practices.
 2014-02-11 20:16:26 +00:00
Katie McCormick
0cb2c76b66 Merge "Doc update: clarify best practices." into klp-docs 2014-02-11 20:13:34 +00:00
Griff Hazen
dfcb0803bf Add local-only option to Notification (using flag) 
Change-Id: Ic6d2f3b0cf06b58c0afa2af0fa6b245124424223
 2014-02-11 12:00:00 -08:00
Kenny Guy
826e51c4da Merge "Add concepts of related users and managed profiles to user manager." 2014-02-11 19:27:36 +00:00
Michael Wright
0d148c8b4e Merge "Move inputservice over to frameworks/native" 2014-02-11 19:09:12 +00:00
Qiwen Zhao
f3797327f9 Merge branch 'master-nova' of persistent-https://googleplex-android.googlesource.com/platform/frameworks/base into master-nova 2014-02-11 10:59:34 -08:00
John Reck
75d8f20b9b am 9b6fa775: Merge "Implement missing safelyRun() on ThreadedRenderer" 
* commit '9b6fa7751864452d821059dc55c6d86f9011ee63':
  Implement missing safelyRun() on ThreadedRenderer
 2014-02-11 10:58:59 -08:00
Qiwen Zhao
646038e601 Merge branch 'master-nova' of persistent-https://googleplex-android.googlesource.com/platform/frameworks/base into master-nova 2014-02-11 10:57:47 -08:00
Qiwen Zhao
13f0a3a43d reset to master for this file since it is missing an older change. 2014-02-11 10:56:43 -08:00
John Reck
9b6fa77518 Merge "Implement missing safelyRun() on ThreadedRenderer" 2014-02-11 18:55:46 +00:00
Michael Wright
d6b473713f 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.

Try 2.

Change-Id: I84259356d3eb8efc5aefb9d6b311b5fc590ea3ed
 2014-02-11 10:47:36 -08:00
John Reck
fc53ef2779 Implement missing safelyRun() on ThreadedRenderer 
Change-Id: I14b75f37a13fabaa759a51369190dbdc84087c4b
 2014-02-11 10:40:25 -08:00
Eino-Ville Talvala
c737d5c7f9 am 3b1da03c: Merge "camera2: Clean up cross-references" 
* commit '3b1da03c8b9b569759e2d6ffee7cbdea7ff7fa32':
  camera2: Clean up cross-references
 2014-02-11 10:28:06 -08:00
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
Eino-Ville Talvala
3b1da03c8b Merge "camera2: Clean up cross-references" 2014-02-11 17:57:08 +00: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
Kenny Guy
a52dc3eb40 Add concepts of related users and managed profiles to user manager. 
Related users are a group that will share things like notifications.
Managed profiles are a profile of another user.

Change-Id: I2d0532f1abf939810f0fa3fc7c77ad13fa567833
 2014-02-11 15:33:14 +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