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

127137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Lawrence
d2cf756996 am df42723d: Merge "Don\'t double prompt on booting encrypted device" 
* commit 'df42723d6b717fd2882c98c930a0f93c75af2474':
  Don't double prompt on booting encrypted device
 2014-04-01 15:12:17 +00:00
Paul Lawrence
df42723d6b Merge "Don't double prompt on booting encrypted device" 2014-04-01 15:07:10 +00:00
Deepanshu Gupta
a11b17a7ae am 779b0eea: Merge "Fix visitFieldInsn in layoutlib_create." 
* commit '779b0eea300509ef072a8aa043a3c486d565110b':
  Fix visitFieldInsn in layoutlib_create.
 2014-04-01 05:42:41 +00:00
Deepanshu Gupta
779b0eea30 Merge "Fix visitFieldInsn in layoutlib_create." 2014-04-01 05:37:23 +00:00
Deepanshu Gupta
4a0f93bd32 Fix visitFieldInsn in layoutlib_create. 
The bug caused some classes to be missed when computing the dependencies
of the existing classes.

Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
 2014-03-31 19:06:53 -07:00
Brian Williammee
36617660ab am 9647379a: Merge "Clean up two wifi javadoc comments" 
* commit '9647379a602d3df56ced0eb60bfcd3946917d486':
  Clean up two wifi javadoc comments
 2014-04-01 01:37:38 +00:00
Baligh Uddin
f5f39ed3b0 am f713e835: (-s ours) am a3e6f36f: (-s ours) am 8c3d3e82: (-s ours) am 53b3d44f: (-s ours) am dc5e02bd: (-s ours) Import translations. DO NOT MERGE 
* commit 'f713e835fef5a5fd8f638cb91c2025e302baf0f2':
  Import translations. DO NOT MERGE
 2014-04-01 01:32:58 +00:00
Katie McCormick
755d54e258 am 4c9f4571: am fb19fc61: am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix. 
* commit '4c9f457141747b19f2f78f682889313bcbd010e6':
  Doc Update: revert PendingIntent fix.
 2014-04-01 01:32:55 +00:00
Brian Williammee
9647379a60 Merge "Clean up two wifi javadoc comments" 2014-04-01 01:32:19 +00:00
Fabrice Di Meglio
ade07fd429 am a780d932: Merge "Fix bug #13727850 Input values are not visible when setting up the lockscreen... ...security(PIN/Passwor/Pattern)." 
* commit 'a780d9323b3ab9d0a06a9b8569164940d23405d4':
  Fix bug #13727850 Input values are not visible when setting up the lockscreen... ...security(PIN/Passwor/Pattern).
 2014-04-01 01:26:01 +00:00
Baligh Uddin
f713e835fe am a3e6f36f: (-s ours) am 8c3d3e82: (-s ours) am 53b3d44f: (-s ours) am dc5e02bd: (-s ours) Import translations. DO NOT MERGE 
* commit 'a3e6f36f406f9e65dee1a404fc80b6cc96088776':
  Import translations. DO NOT MERGE
 2014-04-01 01:25:45 +00:00
Katie McCormick
4c9f457141 am fb19fc61: am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix. 
* commit 'fb19fc61f28bcff1b129d1a60913f5b8722f10cf':
  Doc Update: revert PendingIntent fix.
 2014-04-01 01:25:41 +00:00
Fabrice Di Meglio
a780d9323b Merge "Fix bug #13727850 Input values are not visible when setting up the lockscreen... ...security(PIN/Passwor/Pattern)." 2014-04-01 01:21:32 +00:00
Zhijun He
70e7b073e0 am 1a9b646c: Camera2: Fix missing capture result callback issue 
* commit '1a9b646c6b83aa091164dc94f9d1348bfca38227':
  Camera2: Fix missing capture result callback issue
 2014-04-01 01:01:58 +00:00
Zhijun He
1a9b646c6b Camera2: Fix missing capture result callback issue 
When configuring output right after submitting some capture request, the
waitUntilIdle clears the capture mCaptureListenerMap and
mRepeatingRequestIdDeletedList. This caused the listener is cleared before
the capture result is delivered to application side. Since the listener is
already removed properly, it is really not needed to clear them right after
idling the device.

It also doesn't make sense to add the repeating request id that has no
listener hooked up to the mRepeatingRequestIdDeletedList, this caused
out of sync between id deleted list and the mCaptureListenerMap for
repeating request.

Bug: 13730119
Change-Id: I94ab7a5515f841ffd97b103c2c1b71d92afd955a
 2014-03-31 17:34:29 -07:00
Jason Sams
9f7042ef29 am afec430a: am c796ccaa: am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem" 
* commit 'afec430ada65936a4bb9143ec82c4c0429032fed':
  Fix RenderScriptGL setSurfaceTexture problem
 2014-04-01 00:31:12 +00:00
Scott Main
167b6dc728 am 0ba2de85: am 7471a3b1: am adcb288e: am b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs 
* commit '0ba2de8530a5006538154fb5151081c60afef52d':
  update common intents guide to add calendar and alarms.
 2014-04-01 00:31:09 +00:00
Baligh Uddin
38b7096755 am 658e9080: (-s ours) am ce0854cc: (-s ours) am ee800b04: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '658e9080215ca852b15633ce4926a738ed24f9ef':
  Import translations. DO NOT MERGE
 2014-04-01 00:31:06 +00:00
Jason Sams
afec430ada am c796ccaa: am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem" 
* commit 'c796ccaafb935592b98d5aaad2594791935f6530':
  Fix RenderScriptGL setSurfaceTexture problem
 2014-04-01 00:24:57 +00:00
Scott Main
0ba2de8530 am 7471a3b1: am adcb288e: am b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs 
* commit '7471a3b1ea3b722168ed3e932d4015750c913c0b':
  update common intents guide to add calendar and alarms.
 2014-04-01 00:24:53 +00:00
Baligh Uddin
658e908021 am ce0854cc: (-s ours) am ee800b04: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'ce0854ccba6adae15cd0b1042e3ad5fb777293da':
  Import translations. DO NOT MERGE
 2014-04-01 00:24:50 +00:00
Baligh Uddin
a3e6f36f40 am 8c3d3e82: (-s ours) am 53b3d44f: (-s ours) am dc5e02bd: (-s ours) Import translations. DO NOT MERGE 
* commit '8c3d3e826932da75f5399baaf5bcbc3b1f3a9372':
  Import translations. DO NOT MERGE
 2014-04-01 00:21:37 +00:00
Katie McCormick
fb19fc61f2 am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix. 
* commit '905a5b1477b3a1899ef389dbe081f9c70a4fe13d':
  Doc Update: revert PendingIntent fix.
 2014-04-01 00:21:34 +00:00
Brian Williammee
137ff532eb Clean up two wifi javadoc comments 
Remove references to TI drivers, and unnecessary uncertainty.

Change-Id: I74a01357264338df7c513684c6c752d1edb4ea4d
 2014-03-31 17:18:03 -07:00
Baligh Uddin
8c3d3e8269 am 53b3d44f: (-s ours) am dc5e02bd: (-s ours) Import translations. DO NOT MERGE 
* commit '53b3d44f524c162a18ca91034c90ac9f7e62e561':
  Import translations. DO NOT MERGE
 2014-04-01 00:15:57 +00:00
Katie McCormick
905a5b1477 am 87d9d1a0: Doc Update: revert PendingIntent fix. 
* commit '87d9d1a0405e6cdbcd7c87cfebee04b622100753':
  Doc Update: revert PendingIntent fix.
 2014-04-01 00:15:52 +00:00
Jason Sams
c796ccaafb am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem" 
* commit '095ece10095ecb8c76e3ed4fb0dd1e23a5ced22b':
  Fix RenderScriptGL setSurfaceTexture problem
 2014-04-01 00:15:26 +00:00
Scott Main
7471a3b1ea am adcb288e: am b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs 
* commit 'adcb288e3890381c9961ee32a79df8e9d805a6ad':
  update common intents guide to add calendar and alarms.
 2014-04-01 00:12:56 +00:00
Baligh Uddin
ce0854ccba am ee800b04: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'ee800b04d9ed625db93b1531eec0595838228e2f':
  Import translations. DO NOT MERGE
 2014-04-01 00:12:47 +00:00
Jason Sams
095ece1009 am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem" 
* commit 'b3cafa56205942343930e4fbb0a3d50d6e33a046':
  Fix RenderScriptGL setSurfaceTexture problem
 2014-04-01 00:10:55 +00:00
Alan Viverette
5745dec977 am 28e68c6a: Fix docs even more 
* commit '28e68c6a78c72d1fa419eae578440add369c0d42':
  Fix docs even more
 2014-04-01 00:10:28 +00:00
Alan Viverette
7aa331ba1b am 24369237: Merge "Fix docs" 
* commit '24369237f2a5c067738dcf03747bd37686dace29':
  Fix docs
 2014-04-01 00:10:25 +00:00
Deepanshu Gupta
60583e50b8 am f0cb1598: Merge "Add missing dependency in layoutlib build file" 
* commit 'f0cb159884f4566a72814df3685879a9eb9a173f':
  Add missing dependency in layoutlib build file
 2014-04-01 00:10:22 +00:00
Glenn Kasten
62e73f2415 am b9b07b8c: Merge "AudioTrack and AudioRecord JNI cleanup" 
* commit 'b9b07b8c48dca71c0aa6adf77baabcea0285215e':
  AudioTrack and AudioRecord JNI cleanup
 2014-04-01 00:10:19 +00:00
Alan Viverette
675081a282 am 30cac644: Merge "Switch device default theme over to Quantum" 
* commit '30cac644f161433fca92ca65edcb26b351a04e5a':
  Switch device default theme over to Quantum
 2014-04-01 00:10:16 +00:00
Baligh Uddin
ea0a0364d0 am bf93a28f: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'bf93a28f4cb781cabfb385b29fe6e1bc718bef5e':
  Import translations. DO NOT MERGE
 2014-04-01 00:10:09 +00:00
Baligh Uddin
10bfad1dbe am 9fa67d8e: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '9fa67d8e4dd2f54f779c9090ee88eabc0fbc0cac':
  Import translations. DO NOT MERGE
 2014-04-01 00:10:06 +00:00
Baligh Uddin
53b3d44f52 am dc5e02bd: (-s ours) Import translations. DO NOT MERGE 
* commit 'dc5e02bdccbbc60ede21ae706f06c696b6983812':
  Import translations. DO NOT MERGE
 2014-04-01 00:09:22 +00:00
Scott Main
adcb288e38 am b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs 
* commit 'b1088bfe8d321f299d92736102b573963315dc26':
  update common intents guide to add calendar and alarms.
 2014-04-01 00:03:18 +00:00
Fabrice Di Meglio
1cf3594114 Fix bug #13727850 Input values are not visible when setting up the lockscreen... 
...security(PIN/Passwor/Pattern).

- remove that hardcoded color
- enable passing a color for the Path lines

Change-Id: Ie40b15bf209f41ea2df16842a3e56ffc2020df65
 2014-03-31 16:50:29 -07:00
Alan Viverette
28e68c6a78 Fix docs even more 
Change-Id: I436615302d24f2f098e2224881c65dbef0d20cfa
 2014-03-31 16:41:31 -07:00
Alan Viverette
24369237f2 Merge "Fix docs" 2014-03-31 23:39:11 +00:00
Alan Viverette
dead414a90 Fix docs 
Change-Id: I79ee1cccb723f7471b175e1f2fc7ac94d54a526e
 2014-03-31 16:37:42 -07:00
Jason Sams
b3cafa5620 Merge "Fix RenderScriptGL setSurfaceTexture problem" 2014-03-31 23:21:42 +00:00
Katie McCormick
87d9d1a040 Doc Update: revert PendingIntent fix. 
Original fix was in error. Reverting. See:

b/10641568

Change-Id: I471157388b2d55aa99bd16813c07607b8a0a7046
 2014-03-31 16:18:15 -07:00
Deepanshu Gupta
f0cb159884 Merge "Add missing dependency in layoutlib build file" 2014-03-31 23:14:35 +00:00
Deepanshu Gupta
411b9691e3 Add missing dependency in layoutlib build file 
Add missing dependency on built_ext_data

Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
 2014-03-31 16:11:13 -07:00
Glenn Kasten
b9b07b8c48 Merge "AudioTrack and AudioRecord JNI cleanup" 2014-03-31 23:06:50 +00:00
Alan Viverette
30cac644f1 Merge "Switch device default theme over to Quantum" 2014-03-31 22:38:14 +00:00
Baligh Uddin
f7002f4ef8 Merge "Import translations. DO NOT MERGE" into master-lockscreen-dev 2014-03-31 22:11:38 +00:00