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

153691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
39ce6ba27e am d7a3ae38: am 1f6a16f1: am cde64643: am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs 
* commit 'd7a3ae3835cb48289dfacb3215594550a9bd8969':
  docs: Fixed notification background bug. Bug: 16801684
 2014-08-27 16:22:14 +00:00
Baligh Uddin
8364cea60a am 7f74dffc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '7f74dffc181e4cd2d237d85ef29f2bd6a04964da':
  Import translations. DO NOT MERGE
 2014-08-27 16:22:08 +00:00
Baligh Uddin
26b0882a7d am d87aa19b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'd87aa19b12056d5e9dafc0dd8d34204d9b1bfc05':
  Import translations. DO NOT MERGE
 2014-08-27 16:22:04 +00:00
Baligh Uddin
43d650b732 am 550578f5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '550578f574fc0988c43b0e19a8611f6eab2014db':
  Import translations. DO NOT MERGE
 2014-08-27 16:21:59 +00:00
Calin Juravle
97da4613a3 am 2f63f7ab: am 852debcc: Merge "Update the handling of the native bridge property." 
* commit '2f63f7abd390dd2ee16889c047164caac308d101':
  Update the handling of the native bridge property.
 2014-08-27 16:18:31 +00:00
Calin Juravle
fa9f2d5445 am 9dcfcff9: (-s ours) am 3bec87c9: Merge "Pass vmSafeMode (manifest attribute) to installd." 
* commit '9dcfcff9207b57e5bfa87b18f2383a5637f06bbb':
  Pass vmSafeMode (manifest attribute) to installd.
 2014-08-27 16:18:18 +00:00
Ricardo Cervera
fc2497fe00 am 665fc318: am df139acf: am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 
* commit '665fc3185d2bda1780ddc9074f46e11777e05405':
  docs: Fixed Google Play Services version number. Bug: 17195954
 2014-08-27 16:17:03 +00:00
Ricardo Cervera
1794dd8b7d am 76428e01: am 37e3f101: am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs 
* commit '76428e01565997f21b6a50bd82088b11f7a1ac15':
  docs: Changed studio links to HTTPS from HTTP. Bug: 17295924
 2014-08-27 16:16:55 +00:00
Joe Fernandez
402282f3b5 am cafad301: am 82521171: Merge "docs: add warning to redirects file" into klp-modular-docs 
* commit 'cafad30176ad621f3d943cab942af2187bdec7dc':
  docs: add warning to redirects file
 2014-08-27 16:16:13 +00:00
Ricardo Cervera
665fc3185d am df139acf: am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 
* commit 'df139acff19cdbca43d9cc312653f03463e645ed':
  docs: Fixed Google Play Services version number. Bug: 17195954
 2014-08-27 16:05:10 +00:00
Ricardo Cervera
76428e0156 am 37e3f101: am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs 
* commit '37e3f10174bbe0308147323e8fcdf01ae09c5622':
  docs: Changed studio links to HTTPS from HTTP. Bug: 17295924
 2014-08-27 16:05:05 +00:00
Ricardo Cervera
20ce284f54 am 1f6a16f1: am cde64643: am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs 
* commit '1f6a16f1def5f09dbfa9a527ee2f33b182b5f0ef':
  docs: Fixed notification background bug. Bug: 16801684
 2014-08-27 16:05:04 +00:00
Joe Fernandez
cafad30176 am 82521171: Merge "docs: add warning to redirects file" into klp-modular-docs 
* commit '825211712c2af5a2b9190662adf3fc93264eefd4':
  docs: add warning to redirects file
 2014-08-27 16:04:47 +00:00
Baligh Uddin
878da52a8b Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-27 16:00:31 +00:00
Baligh Uddin
085511a284 Merge "Import translations. DO NOT MERGE" 2014-08-27 16:00:20 +00:00
Baligh Uddin
1237584983 Merge "Import translations. DO NOT MERGE" 2014-08-27 16:00:11 +00:00
Baligh Uddin
c733367f5a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-27 16:00:03 +00:00
Baligh Uddin
28bb0aae3b Merge "Import translations. DO NOT MERGE" 2014-08-27 16:00:01 +00:00
Baligh Uddin
04cb07bb6c Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-27 15:59:58 +00:00
Baligh Uddin
30b785b566 Merge "Import translations. DO NOT MERGE" 2014-08-27 15:59:56 +00:00
Calin Juravle
2f63f7abd3 am 852debcc: Merge "Update the handling of the native bridge property." 
* commit '852debcc906dbf850b09e7e2fc822fe78bc735e6':
  Update the handling of the native bridge property.
 2014-08-27 15:58:43 +00:00
Calin Juravle
9dcfcff920 am 3bec87c9: Merge "Pass vmSafeMode (manifest attribute) to installd." 
* commit '3bec87c9fab49fc2cc7ad1909331f3978803bdd6':
  Pass vmSafeMode (manifest attribute) to installd.
 2014-08-27 15:58:39 +00:00
Joe Fernandez
825211712c Merge "docs: add warning to redirects file" into klp-modular-docs 2014-08-27 15:57:05 +00:00
Ricardo Cervera
1f6a16f1de am cde64643: am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs 
* commit 'cde64643f9ff0ba3de5757520bead74d4ac52a19':
  docs: Fixed notification background bug. Bug: 16801684
 2014-08-27 15:54:29 +00:00
Ricardo Cervera
df139acff1 am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 
* commit '1cf6ff306e992711c1d6682ed5d69701669fdce3':
  docs: Fixed Google Play Services version number. Bug: 17195954
 2014-08-27 15:54:28 +00:00
Ricardo Cervera
37e3f10174 am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs 
* commit '4f0fedd5017563408436c8fa7702766a487e724f':
  docs: Changed studio links to HTTPS from HTTP. Bug: 17295924
 2014-08-27 15:54:25 +00:00
Calin Juravle
852debcc90 Merge "Update the handling of the native bridge property." 2014-08-27 15:50:38 +00:00
Calin Juravle
3bec87c9fa Merge "Pass vmSafeMode (manifest attribute) to installd." 2014-08-27 15:50:10 +00:00
Julia Reynolds
9ed66da8df Limit the settings profile/device owners can update. 
Bug: 16351901
Change-Id: Id33a57ad651b5b7b58de0549eb90d5a1fe5c19c5
 2014-08-27 11:49:37 -04:00
Ricardo Cervera
1cf6ff306e Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 2014-08-27 15:49:34 +00:00
Ricardo Cervera
4f0fedd501 Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs 2014-08-27 15:44:27 +00:00
Ricardo Cervera
facad7d9a9 docs: Changed studio links to HTTPS from HTTP. Bug: 17295924 
Change-Id: Icafcdba235a22912780253003182479619e16ca1
 2014-08-27 08:41:52 -07:00
Ricardo Cervera
cde64643f9 am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs 
* commit 'd91deea5ec151d53e3640db791948fbe2480f433':
  docs: Fixed notification background bug. Bug: 16801684
 2014-08-27 15:40:35 +00:00
Ricardo Cervera
d91deea5ec Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs 2014-08-27 15:30:41 +00:00
Jorim Jaggi
339878e1a5 am 3d9509d3: am ddf411d6: Merge "Fix that Keyguard didn\'t always get onActivityDrawn call" into lmp-dev 
* commit '3d9509d3bc6409a5600d23e1ded2eaa431c0cad9':
  Fix that Keyguard didn't always get onActivityDrawn call
 2014-08-27 15:28:28 +00:00
Jorim Jaggi
3609640963 am af168d78: am 0f72ddc2: Merge "Fix missing status bar icons" into lmp-dev 
* commit 'af168d785e306e4c3c44d13ec6756e7dfd047d82':
  Fix missing status bar icons
 2014-08-27 15:28:23 +00:00
Ricardo Cervera
aa0009ec6e docs: Fixed Google Play Services version number. Bug: 17195954 
Change-Id: I7a71aa5f600ae11cce388183fc20e4537864122d
 2014-08-27 08:19:26 -07:00
Jorim Jaggi
b55f17003b am ddf411d6: Merge "Fix that Keyguard didn\'t always get onActivityDrawn call" into lmp-dev 
* commit 'ddf411d6895feba8688f89c7c27112d2fa67d30f':
  Fix that Keyguard didn't always get onActivityDrawn call
 2014-08-27 15:18:23 +00:00
Jorim Jaggi
2207453807 am 0f72ddc2: Merge "Fix missing status bar icons" into lmp-dev 
* commit '0f72ddc29dd2883a65b8adba9e74b41ff188c722':
  Fix missing status bar icons
 2014-08-27 15:18:18 +00:00
Jorim Jaggi
86c78f8941 Merge "Fix that Keyguard didn't always get onActivityDrawn call" into lmp-dev 2014-08-27 15:06:00 +00:00
John Spurlock
97b4ec0599 am de0bcb8e: am b916b16a: Merge "Doze: Better handling for non-default templates." into lmp-dev 
* commit 'de0bcb8e298daaf2761e4f9d6d701d4f0abe5438':
  Doze: Better handling for non-default templates.
 2014-08-27 15:05:34 +00:00
Jorim Jaggi
567ce19951 Merge "Fix missing status bar icons" into lmp-dev 2014-08-27 15:05:30 +00:00
Jorim Jaggi
21e8f419a8 Fix missing status bar icons 
Bug: 16481924
Change-Id: I7df734519d112e2b0240f87940f9350bef5ea9df
 2014-08-27 16:56:49 +02:00
John Spurlock
84d29548f2 am b916b16a: Merge "Doze: Better handling for non-default templates." into lmp-dev 
* commit 'b916b16a8d683720737278743bc8781fce4d7831':
  Doze: Better handling for non-default templates.
 2014-08-27 14:55:01 +00:00
Jorim Jaggi
4c499be0ed Fix that Keyguard didn't always get onActivityDrawn call 
Bug: 16481924
Change-Id: I299645c940c71820aa7dc70985e41da869f1368a
 2014-08-27 16:50:49 +02:00
Wei Jin
4d033e1c44 Fix the length of a profiler system property 
This patch changes the profiler system property
"dalvik.vm.profile.max-stack-depth" to "dalvik.vm.profile.stack-depth"
so that the length of the option is less than PROP_NAME_MAX.

Bug: 17294224
Change-Id: I5723883d7fa38dd5eaa276182e5d680d152cedad
 2014-08-27 15:50:17 +01:00
John Spurlock
03ada9901e Merge "Doze: Better handling for non-default templates." into lmp-dev 2014-08-27 14:45:20 +00:00
Sander Alewijnse
c3b7c6693b am 45fb047d: am eb3f4b1c: Merge "Provide lockdown of date/time device owners." into lmp-dev 
* commit '45fb047dab5a96a9ec72c6cf6aa168f80b115d5c':
  Provide lockdown of date/time device owners.
 2014-08-27 14:43:10 +00:00
Sander Alewijnse
49a07d7b62 am eb3f4b1c: Merge "Provide lockdown of date/time device owners." into lmp-dev 
* commit 'eb3f4b1ce11215458c3f231cc8fff0e8e823b6dc':
  Provide lockdown of date/time device owners.
 2014-08-27 14:34:27 +00:00
Sander Alewijnse
ebaf5c70e9 Merge "Provide lockdown of date/time device owners." into lmp-dev 2014-08-27 14:25:35 +00:00