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

121002 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
3b7432d2e4 am bb755da9: am c192cdd3: am cf96f815: docs: Renamed the document on building with Android Studio 
* commit 'bb755da9f7a2a4d3ea103afbc2140901d28e8f74':
  docs: Renamed the document on building with Android Studio
 2014-04-01 19:29:38 +00:00
Ricardo Cervera
bb755da9f7 am c192cdd3: am cf96f815: docs: Renamed the document on building with Android Studio 
* commit 'c192cdd3c4ad8696d5d77949984cf7e06445e051':
  docs: Renamed the document on building with Android Studio
 2014-04-01 17:49:40 +00:00
Ricardo Cervera
c192cdd3c4 am cf96f815: docs: Renamed the document on building with Android Studio 
* commit 'cf96f815854b87f8a2304fbaf5030d574671e6e0':
  docs: Renamed the document on building with Android Studio
 2014-04-01 17:43:32 +00:00
Ricardo Cervera
cf96f81585 docs: Renamed the document on building with Android Studio 
Change-Id: Icc2d3562f8d77b593e7a7bac61675a5b15fcd535
 2014-04-01 10:16:45 -07: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
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
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
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
Baligh Uddin
ee800b04d9 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-03-31 22:11:33 +00:00
Scott Main
b1088bfe8d Merge "update common intents guide to add calendar and alarms." into klp-docs 2014-03-31 21:47:45 +00:00
Zhihai Xu
7d394df2ab am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev 
* commit 'ae1b763cded7e2cb3eec3cbec0680c25e55c109c':
  LE: Add API to configure MTU for a given connection (3/4)
 2014-03-31 21:28:47 +00:00
Zhihai Xu
ae1b763cde Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev 2014-03-31 21:21:54 +00:00
Nick Kralevich
ce30fca85d am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs." 
* commit 'e531e2ec6b311c35b077cc228e832b3f1530dffa':
  Change when the SELinux relabel of /data/data occurs.
 2014-03-31 20:20:41 +00:00
Nick Kralevich
e531e2ec6b am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs." 
* commit '3b2a9d22794cb9f1c2a28884b5c3ba92ecc6ff96':
  Change when the SELinux relabel of /data/data occurs.
 2014-03-31 20:14:37 +00:00
Nick Kralevich
3b2a9d2279 Merge "Change when the SELinux relabel of /data/data occurs." 2014-03-31 20:09:31 +00:00
Brian Carlstrom
7156b7c65d am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation" 
* commit 'b11952d6f6851dbd1da447da967f6e07984942fe':
  Improve detail message for X509TrustManagerExtensions argument validation
 2014-03-31 19:59:31 +00:00
Brian Carlstrom
b11952d6f6 am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation" 
* commit 'e3434fc4fb164b66e529e675dfc31652a4c69cb5':
  Improve detail message for X509TrustManagerExtensions argument validation
 2014-03-31 19:55:16 +00:00
Brian Carlstrom
e3434fc4fb Merge "Improve detail message for X509TrustManagerExtensions argument validation" 2014-03-31 19:49:35 +00:00
Craig Stout
fe710551cf am ecaea7e6: Merge "Force refresh of stateful when a child drawable is changed." into klp-modular-dev 
* commit 'ecaea7e60c0992ac295163f55c1f986a46eef008':
  Force refresh of stateful when a child drawable is changed.
 2014-03-31 19:08:24 +00:00
Craig Stout
ecaea7e60c Merge "Force refresh of stateful when a child drawable is changed." into klp-modular-dev 2014-03-31 19:02:25 +00:00
Baligh Uddin
23f64109d0 Import translations. DO NOT MERGE 
Change-Id: Iaac2af2440931132501062c4eab4ab609fea8857
Auto-generated-cl: translation import
 2014-03-31 11:37:11 -07:00
Baligh Uddin
dc5e02bdcc Import translations. DO NOT MERGE 
Change-Id: I2cd18ee1d77495f7294bdb4e836def0bb394d8f4
Auto-generated-cl: translation import
 2014-03-31 11:34:59 -07:00
Brian Carlstrom
ff9ca781d0 Improve detail message for X509TrustManagerExtensions argument validation 
Bug: 13728564
Change-Id: I03d08babcdc0d11baff5e76a339b4285e92edee8
 2014-03-31 11:22:34 -07:00
Narayan Kamath
56a8f8b48f resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp 
This isn't a straightforward conflict resolution. This code
has changed significantly. mSafeMode is now a flag on the activity
manager service, and is set when SystemServer calls enterSafeMode.

Change-Id: I1e8ff524566c5e44bb6bf3b138cdebb70004aca3
 2014-03-31 14:10:53 +01:00
Narayan Kamath
439145f0e7 am ab561f5b: Merge "Don\'t make isSafeMode a field on the Zygote class." 
* commit 'ab561f5b4073055c414866ff3dbe8372263474a7':
  Don't make isSafeMode a field on the Zygote class.
 2014-03-31 12:42:14 +00:00
Narayan Kamath
ab561f5b40 Merge "Don't make isSafeMode a field on the Zygote class." 2014-03-31 12:32:50 +00:00
Narayan Kamath
d1a8d9f452 Don't make isSafeMode a field on the Zygote class. 
This field is written and read exclusively by the system server,
and should therefore belong to the SystemServer class.

Change-Id: I2708a9a45c0c9cd1a6f563e8cc5844bd8c424bf7
 2014-03-31 13:16:45 +01:00
Narayan Kamath
303d666f2e am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint" 
* commit '0e3f3c70226640759d5d705233fbe59f525355bb':
  Cast CallMethod's size_t parameters to jint
 2014-03-31 09:48:27 +00:00
Narayan Kamath
0e3f3c7022 am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint" 
* commit '91bbb75c75568dee854fb10633f8ce3683265ffd':
  Cast CallMethod's size_t parameters to jint
 2014-03-31 09:41:39 +00:00
Narayan Kamath
91bbb75c75 Merge "Cast CallMethod's size_t parameters to jint" 2014-03-31 09:37:32 +00:00
Xiaofei Wan
21e0af987d Fix RenderScriptGL setSurfaceTexture problem 
rsnContextSetSurfaceTexture() has no implementation in rs-jni, use nContextSetSurface() in setSurfaceTexture().

Change-Id: I066432575c9e74f21ea3a3776628b572b6e31377
Signed-off-by: Xiaofei Wan <xiaofei.wan@intel.com>
 2014-03-31 14:40:08 +08:00
Jinsuk Kim
2e59bd7885 am 41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev 
* commit '41eaa32c100d8a903daa7b7d09d34887a3e45ffd':
  Replace individual methods with a consolidated CEC nativeSendmessage
 2014-03-31 01:44:51 +00:00
Jinsuk Kim
41eaa32c10 Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev 2014-03-31 01:40:30 +00:00
Wink Saville
80b4e09849 am 44b43a51: am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue" 
* commit '44b43a51c7d7e5c2cbe1d9912ee4a21686fa1a58':
  GlobalActions: Fix Airplane Mode on/off issue
 2014-03-30 15:17:38 +00:00
Wink Saville
44b43a51c7 am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue" 
* commit '1e4cad8198056a5e27a7aeb104ceb8ada331eafe':
  GlobalActions: Fix Airplane Mode on/off issue
 2014-03-30 15:11:27 +00:00
Wink Saville
1e4cad8198 Merge "GlobalActions: Fix Airplane Mode on/off issue" 2014-03-30 00:15:22 +00:00
Wei Wang
1b09c97d8a am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev 
* commit '4447405d76b5a9152aacadbfdefd1f8fd60a03ad':
  Callback on correct method when status is unsuccessful.
 2014-03-29 01:57:31 +00:00
Wei Wang
4447405d76 Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev 2014-03-29 01:53:33 +00:00
Wei Wang
c07a5dd709 Callback on correct method when status is unsuccessful. 
Change-Id: I63c07bbae559765af1aecb492379ab18268336d8
 2014-03-29 01:42:41 +00:00
Michael Wright
5d7db503bd am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev 
* commit 'e9eb58c9a0f48f1ea3afa60f01cfab1f539e5d8e':
  Add InputDevice#supportsSource(int).
 2014-03-29 00:59:49 +00:00
Michael Wright
4669cfff1e am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev 
* commit 'd020fd33d147c88a9cda4976d2fa559e55b4ab03':
  Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
  Adds API for determining confirm and cancel keys.
 2014-03-29 00:59:46 +00:00
Michael Wright
e9eb58c9a0 Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev 2014-03-29 00:56:17 +00:00