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

132130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
e8bd50b00c am 1578e08d: Merge "Attempt to fix blank lockscreen." 
* commit '1578e08db4db31faf0b44a948c93f9992077c131':
  Attempt to fix blank lockscreen.
 2014-04-25 16:18:02 +00:00
Colin Cross
3b687a155d am c955677c: fix build 
* commit 'c955677c1b2e03ad048e034bd033dd66dfd72ef3':
  fix build
 2014-04-25 16:17:39 +00:00
Craig Mautner
102e5bc42c am 3ce4bd3e: am e5889679: am 3a656ea3: Merge "Too soon." into klp-modular-dev 
* commit '3ce4bd3e715bd10e35bbc88204653c19b3b91f44':
  Too soon.
 2014-04-25 16:17:25 +00:00
Elliott Hughes
b9d892c0b2 am b1b484aa: Merge "Track package change." 
* commit 'b1b484aab376026f16d80f770417d72a87ea4afc':
  Track package change.
 2014-04-25 16:17:20 +00:00
Selim Gurun
4b0d678d08 am da5c5325: am 7466e3bb: am e3fc3073: am 8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl." 
* commit 'da5c532573bcdd1698822384e9e20d7e64195987':
  Add a stub for forgotten callback to fix master-gpl.
 2014-04-25 16:17:14 +00:00
Ruben Brunk
49b470a76e am 87cfaca4: Merge "camera2: Add DNG creator class." 
* commit '87cfaca4760af82fdf85b8a740eac9b79564ee2d':
  camera2: Add DNG creator class.
 2014-04-25 16:17:11 +00:00
Selim Gurun
3d9bcd8cc0 am f1e7e4ef: am a6972684: am f7a19173: am adad989b: Merge "Add a stub to fix master-gpl" 
* commit 'f1e7e4efcc8edcb8cead746e48fa66fb2bdbcfff':
  Add a stub to fix master-gpl
 2014-04-25 16:09:01 +00:00
Craig Mautner
f4cbd28015 am 400988b6: am fbb0796e: am 3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev 
* commit '400988b69c2ee1e9e9502f12cbb407f1cc867da6':
  Add test for attribute android:allowEmbedded
 2014-04-25 16:08:55 +00:00
Christopher Tate
a566a98de9 am 2ac0462e: Merge "Send factory reset notification broadcasts at foreground priority" 
* commit '2ac0462e7bdf0f7cfc8163bfa31cf4a90161a879':
  Send factory reset notification broadcasts at foreground priority
 2014-04-25 16:08:47 +00:00
Elliott Hughes
6a885ba4a0 am ccec5f0d: resolved conflicts for merge of 02e85744 to master 
* commit 'ccec5f0def723baa6c4c80bd7ff1971a32c9d8c3':
  Use the suggested public API instead of libcore.os.
 2014-04-25 16:08:43 +00:00
Andrew Solovay
8e5933dbc4 am 23af77a3: am 9a4db311: am 3cb4430b: am 27547e6d: am fdc9e56f: Correcting name of \'Backup & reset\' menu. 
* commit '23af77a3cd1febc740d885ff03ead09837df269c':
  Correcting name of 'Backup & reset' menu.
 2014-04-25 16:08:34 +00:00
Dianne Hackborn
6f467d3e43 am 898be168: Merge "Add support for muliple active development codenames." 
* commit '898be168bda75b204611e8e24439d33213ecab5f':
  Add support for muliple active development codenames.
 2014-04-25 16:08:31 +00:00
Christopher Tate
54c5d0cbff am 12e75126: Merge "Fix native-lib dir assignment & updating" 
* commit '12e75126909152c448f70c48f3d2f2884cb359bd':
  Fix native-lib dir assignment & updating
 2014-04-25 16:08:24 +00:00
Selim Gurun
65fb1dafe4 am 7d5a5cbf: Merge "Add ClientCert support" 
* commit '7d5a5cbfd96610cfe6ad7f1760e24284d6c8e168':
  Add ClientCert support
 2014-04-25 16:08:20 +00:00
Winson Chung
0aed0dd40a am 67b082e0: Merge "Enabling doc centric recents on phones." 
* commit '67b082e02cbfb7bafe046a619e686e9a5c1abc05':
  Enabling doc centric recents on phones.
 2014-04-25 16:08:17 +00:00
Mark Salyzyn
631e96b292 am 7bdcc0b1: am fc02fcc8: am eacaa353: am c717179e: Merge "jni: android_util_Process 64 bit issues" 
* commit '7bdcc0b189c617a0eff497d2a4cc260ee960d8eb':
  jni: android_util_Process 64 bit issues
 2014-04-25 15:53:00 +00:00
ztenghui
9853dd8215 am 7bfe9c45: Merge "Format the xml files for the VectorDrawableTest" 
* commit '7bfe9c450db1bafb0a5469b94afcc81ae003e13a':
  Format the xml files for the VectorDrawableTest
 2014-04-25 15:52:57 +00:00
Chris Craik
3b951a2190 am 06916dcb: Merge "Add floats-only drawRoundRect to Canvas" 
* commit '06916dcb05eeee8c809bb18d170a3f73b5ee1427':
  Add floats-only drawRoundRect to Canvas
 2014-04-25 15:52:52 +00:00
Kenny Root
60307b5118 am 97efc15b: Merge "PackageManager: remove GET_CERTIFICATES boolean" 
* commit '97efc15b32b61a5deb1f54c6c08844b788785c39':
  PackageManager: remove GET_CERTIFICATES boolean
 2014-04-25 15:52:29 +00:00
Jorim Jaggi
bea6990e64 am fb2b6bc6: Merge "Add text view for double-tap and unlock hint on Keyguard." 
* commit 'fb2b6bc62d54a6abdc2ec61c2299e060b6ae6671':
  Add text view for double-tap and unlock hint on Keyguard.
 2014-04-25 15:52:20 +00:00
Dianne Hackborn
bbd90e7fc3 am d80cb24a: Merge "Fix api." 
* commit 'd80cb24a5772d5536ac52ea7edee05f782575e60':
  Fix api.
 2014-04-25 15:51:51 +00:00
Jeff Davidson
004ab8cc95 am ede08340: Merge "API tweaks for network score settings." 
* commit 'ede08340e1ac6b783cba52944474c28013f59cf9':
  API tweaks for network score settings.
 2014-04-25 15:51:47 +00:00
Nick Kralevich
11acbe519a am 38897b30: am 69ee6b0a: am 140dc63f: am 84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server" 
* commit '38897b30b792589ba1777c8eded23d9ab2647921':
  Zygote: enable CAP_BLOCK_SUSPEND capability for system server
 2014-04-25 14:57:50 +00:00
Jorim Jaggi
1578e08db4 Merge "Attempt to fix blank lockscreen." 2014-04-25 13:13:12 +00:00
Jorim Jaggi
c357ca2013 Attempt to fix blank lockscreen. 
Bug: 14280857
Change-Id: Icf458040b1a0b0a412981acf7b522d04c046a5f8
 2014-04-25 14:56:15 +02:00
Colin Cross
c955677c1b fix build 
When commit 4e48f40b0384110082bec52caf38d2d47ce505f5 merged from
AOSP it added a hunk that was already present.  Remove the second
copy.

Change-Id: I48b30fd5fe21d6668cc904744fed7d5044fae91d
 2014-04-24 22:45:05 -07:00
Craig Mautner
3ce4bd3e71 am e5889679: am 3a656ea3: Merge "Too soon." into klp-modular-dev 
* commit 'e5889679f69c93f85bca9e94710d5e60a0b1a629':
  Too soon.
 2014-04-25 03:10:13 +00:00
Craig Mautner
e5889679f6 am 3a656ea3: Merge "Too soon." into klp-modular-dev 
* commit '3a656ea32e6d6489f4bc45884e5acede9fe2de51':
  Too soon.
 2014-04-25 03:06:34 +00:00
Craig Mautner
3a656ea32e Merge "Too soon." into klp-modular-dev 2014-04-25 03:03:37 +00:00
Craig Mautner
2e46e65e9d Too soon. 
Change-Id: I1abb1d4841e4e6342c3b861d33ae22e22ed0a161
 2014-04-25 03:01:40 +00:00
Elliott Hughes
b1b484aab3 Merge "Track package change." 2014-04-25 02:06:39 +00:00
Elliott Hughes
96472bec78 Track package change. 
Change-Id: I6a8123d8e69367fc1ce27bac46c4bcec489d73ba
 2014-04-24 19:05:43 -07:00
Selim Gurun
da5c532573 am 7466e3bb: am e3fc3073: am 8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl." 
* commit '7466e3bbbd13b563e1a5adcc537ea0f132045038':
  Add a stub for forgotten callback to fix master-gpl.
 2014-04-25 01:19:31 +00:00
Selim Gurun
7466e3bbbd am e3fc3073: am 8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl." 
* commit 'e3fc3073826b4fdfa0d1be17fe0c79ccf211ad7d':
  Add a stub for forgotten callback to fix master-gpl.
 2014-04-25 01:15:36 +00:00
Selim Gurun
e3fc307382 am 8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl." 
* commit '8c2d70f5e8dfe64213f44c29562fe4240779b68b':
  Add a stub for forgotten callback to fix master-gpl.
 2014-04-25 01:12:46 +00:00
Ruben Brunk
87cfaca476 Merge "camera2: Add DNG creator class." 2014-04-25 01:10:08 +00:00
Selim Gurun
8c2d70f5e8 Merge "Add a stub for forgotten callback to fix master-gpl." 2014-04-25 01:08:48 +00:00
Selim Gurun
4e48f40b03 Add a stub for forgotten callback to fix master-gpl. 
Change-Id: I375dba89403d09dc39f696de04e0811633ecc803
 2014-04-24 18:04:04 -07:00
Selim Gurun
f1e7e4efcc am a6972684: am f7a19173: am adad989b: Merge "Add a stub to fix master-gpl" 
* commit 'a697268442a68fef255863f0a8a0fa1a610dc340':
  Add a stub to fix master-gpl
 2014-04-25 00:52:37 +00:00
Selim Gurun
a697268442 am f7a19173: am adad989b: Merge "Add a stub to fix master-gpl" 
* commit 'f7a191731f6c840eed9283652648f267589502c2':
  Add a stub to fix master-gpl
 2014-04-25 00:47:23 +00:00
Craig Mautner
400988b69c am fbb0796e: am 3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev 
* commit 'fbb0796eb3bbbdfeb3218b9495a0f36f4cf4ed19':
  Add test for attribute android:allowEmbedded
 2014-04-25 00:44:56 +00:00
Craig Mautner
fbb0796eb3 am 3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev 
* commit '3359bbe02ca645bae2f495df51e7b4001de6c2b1':
  Add test for attribute android:allowEmbedded
 2014-04-25 00:42:25 +00:00
Selim Gurun
f7a191731f am adad989b: Merge "Add a stub to fix master-gpl" 
* commit 'adad989b6a2c736f427526e747dcb89ed9762bab':
  Add a stub to fix master-gpl
 2014-04-25 00:41:59 +00:00
Selim Gurun
adad989b6a Merge "Add a stub to fix master-gpl" 2014-04-25 00:39:10 +00:00
Craig Mautner
3359bbe02c Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev 2014-04-25 00:39:06 +00:00
Selim Gurun
85b89bf7a3 Add a stub to fix master-gpl 
Change-Id: I4cadd3a6e33843ccac4ef2eacbe508e40628367c
 2014-04-24 17:31:07 -07:00
Christopher Tate
2ac0462e7b Merge "Send factory reset notification broadcasts at foreground priority" 2014-04-25 00:26:05 +00:00
Elliott Hughes
ccec5f0def resolved conflicts for merge of 02e85744 to master 
Change-Id: Id4c0ecfedc7ec4ff4b76331be025817445a652e9
 2014-04-24 17:18:10 -07:00
Elliott Hughes
02e857441f am 5f5ca3bc: am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os." 
* commit '5f5ca3bc98fb773ee905289300595ad95d5ffabe':
  Use the suggested public API instead of libcore.os.
 2014-04-24 23:59:05 +00:00
Elliott Hughes
5f5ca3bc98 am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os." 
* commit '31a1dd2a8f56b439861ee335b55f44323318830c':
  Use the suggested public API instead of libcore.os.
 2014-04-24 23:55:09 +00:00