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

132156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Allen Hair
0723b8ebb2 am 95a90440: Merge "Fix nativeGetAnimationFrameStats to use the correct times." 
* commit '95a90440e5a2cdb5f6bc4e8657f78d54622e600e':
  Fix nativeGetAnimationFrameStats to use the correct times.
 2014-04-25 17:05:52 +00:00
Allen Hair
d5b9768f53 am 3647eec9: Merge "Fixed shell manifest to use correct permission." 
* commit '3647eec94bd47e45dc1db1ce23437ae45fa6247d':
  Fixed shell manifest to use correct permission.
 2014-04-25 17:01:28 +00:00
Allen Hair
24a4ce3566 Merge "Fix nativeGetAnimationFrameStats to use the correct times." 2014-04-25 16:59:21 +00:00
Allen Hair
7659093187 Merge "Fixed shell manifest to use correct permission." 2014-04-25 16:57:35 +00:00
Selim Gurun
379a7473a9 am 8e570eeb: Merge "Clarify a use case." 
* commit '8e570eeb4a2c9030bed88865def37b6d24c3e32e':
  Clarify a use case.
 2014-04-25 16:49:35 +00:00
Yuling Liang
59e3b2f3d2 am c58eed99: am 60f8349b: am 243e551a: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit 'c58eed991e8a1749a2acdc9c11bfcc445bac84be':
  Followon fix for 14276128 Clipping at bottom of TextView
 2014-04-25 16:45:18 +00:00
Selim Gurun
f9a031c134 Merge "Clarify a use case." 2014-04-25 16:44:10 +00:00
Yuling Liang
ec2b7d6dd7 am 60f8349b: am 243e551a: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit '60f8349b9819130e81e28106a35bf3362d337045':
  Followon fix for 14276128 Clipping at bottom of TextView
 2014-04-25 16:41:07 +00:00
Selim Gurun
f2d50e5536 Clarify a use case. 
Clarify a use case regarding clearing client certificates.

Change-Id: Ifdfa00022bb21b26e6f62dbad585faef4f8fc3c7
 2014-04-25 09:39:31 -07:00
Yuling Liang
60f8349b98 am 243e551a: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit '243e551ac380f86639eee3e95a482d8e17836670':
  Followon fix for 14276128 Clipping at bottom of TextView
 2014-04-25 16:34:15 +00:00
Yuling Liang
243e551ac3 Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 2014-04-25 16:30:12 +00:00
Chris Craik
a5826864ed am 2cfb1caa: Merge "Refactor Drawable outline production, flesh out Outline methods" 
* commit '2cfb1caaddd33f768a1fb66a82f373469da995f5':
  Refactor Drawable outline production, flesh out Outline methods
 2014-04-25 16:26:21 +00:00
Chris Craik
07f0b8ee73 Merge "Refactor Drawable outline production, flesh out Outline methods" 2014-04-25 16:22:26 +00:00
Marco Nelissen
1fa7fcaa2d am f8f9e166: am ebd6a2d2: am eded9e3b: am adcf38c9: Merge "Release DrmManagerClient resources" 
* commit 'f8f9e16691e7ce5303f562f05dde33970bd14e0b':
  Release DrmManagerClient resources
 2014-04-25 16:18:13 +00:00
Jungshik Jang
e900b59f32 am a8ffe374: Merge "Implement skeleton of new HDMI Control Service." 
* commit 'a8ffe374cc243fd2ab828713326de3dbe88552b9':
  Implement skeleton of new HDMI Control Service.
 2014-04-25 16:18:07 +00:00
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
Marco Nelissen
c806d5393f am ebd6a2d2: am eded9e3b: am adcf38c9: Merge "Release DrmManagerClient resources" 
* commit 'ebd6a2d2710ebf7196a399d6d5a2f0745844310b':
  Release DrmManagerClient resources
 2014-04-25 14:55:11 +00:00
Marco Nelissen
ebd6a2d271 am eded9e3b: am adcf38c9: Merge "Release DrmManagerClient resources" 
* commit 'eded9e3b7f6f30526365461a25624b841611af28':
  Release DrmManagerClient resources
 2014-04-25 14:52:18 +00:00
Marco Nelissen
eded9e3b7f am adcf38c9: Merge "Release DrmManagerClient resources" 
* commit 'adcf38c9936fa372309d413cec03a1413e797c7a':
  Release DrmManagerClient resources
 2014-04-25 14:46:35 +00:00
Marco Nelissen
adcf38c993 Merge "Release DrmManagerClient resources" 2014-04-25 14:42:02 +00:00
Jungshik Jang
a77f358eed Merge "Implement skeleton of new HDMI Control Service." 2014-04-25 14:09:18 +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