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

86661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
45bb2d4f2c am d8132081: am 178af594: Add debug to help with b/7135184. 
* commit 'd8132081b57233b7dda9863a6c51693d5971cd30':
  Add debug to help with b/7135184.
 2012-09-17 14:53:36 -07:00
Irfan Sheriff
324e0f2835 am aef375f3: am cc5dd18d: Merge "Change order of ps and suspendmode calls" into jb-mr1-dev 
* commit 'aef375f3b85e21494d21834534ee3ee41ad2e13d':
  Change order of ps and suspendmode calls
 2012-09-17 14:53:27 -07:00
Baligh Uddin
b96f0dae91 am 2b098223: (-s ours) am c71a57d6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '2b09822330dff7cbb057a7da05d2bd50a534d797':
  Import translations. DO NOT MERGE
 2012-09-17 14:53:10 -07:00
Baligh Uddin
0d705de5d0 am 7954a5b3: (-s ours) am 5dbeb6a8: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '7954a5b35277b6c04f0e3a988195bbb5ad76b088':
  Import translations. DO NOT MERGE
 2012-09-17 14:52:58 -07:00
Siva Velusamy
b98c8342b9 am 0a164f8e: am 9d7657c5: Merge "PhoneStatusBar: Fix NPE while accessing quick settings." into jb-mr1-dev 
* commit '0a164f8efee58d949b745210085a2a321a2f0e91':
  PhoneStatusBar: Fix NPE while accessing quick settings.
 2012-09-17 14:52:55 -07:00
Eino-Ville Talvala
c5eb2b5d90 am 978f5c6a: am b181909e: Merge "Camera: Document face detection confidence recommendations." into jb-mr1-dev 
* commit '978f5c6a2c3c6088ff77fbe84fbf3976b631346b':
  Camera: Document face detection confidence recommendations.
 2012-09-17 14:52:49 -07:00
Eric Laurent
1eb6f0f84b am 0d2c4fb0: am 39a37c3b: Merge "headphone volume limitation" into jb-mr1-dev 
* commit '0d2c4fb08a8225909295c10602c83f63aa155f95':
  headphone volume limitation
 2012-09-17 14:46:28 -07:00
Irfan Sheriff
0f0e58ccf2 am 1fa0aa29: am 89c82814: Merge "Add restoreCallingIdentity under finally" into jb-mr1-dev 
* commit '1fa0aa291ba1fd499b312fb2c8a5dcf288751606':
  Add restoreCallingIdentity under finally
 2012-09-17 14:46:03 -07:00
Dianne Hackborn
00c4b0c015 am 86fa4926: am 8406d05b: Merge "New uninstall option to uninstall for all users." into jb-mr1-dev 
* commit '86fa49265e8df22e444e36717a956a3470352e7b':
  New uninstall option to uninstall for all users.
 2012-09-17 14:45:58 -07:00
Dianne Hackborn
9905a8d4bb am 68128325: am 443e4748: Merge "Fix issue #7175553: GRANT_URI_PERMISSION doesn\'t apper to work on secondary user" into jb-mr1-dev 
* commit '681283257d6ff4f77a5ca66a0e7ad51c90320db6':
  Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on secondary user
 2012-09-17 14:45:54 -07:00
Irfan Sheriff
9fe955c4fc am e3141345: am db831da4: Fix permission accessing getCurrentUser 
* commit 'e3141345d81a0f667bb3980e28183bb95a281215':
  Fix permission accessing getCurrentUser
 2012-09-17 14:45:51 -07:00
Irfan Sheriff
0528e25c46 am e116c78b: am 61e8180b: Merge "Fix suspend settings at boot" into jb-mr1-dev 
* commit 'e116c78b0d1add3a9058d24935f073235c02b5c5':
  Fix suspend settings at boot
 2012-09-17 14:45:47 -07:00
Adam Powell
307b3bd0a6 am 5a12c0c8: am fa9fc5bc: Merge "Add a minimum height of 64dp for AlertDialog content" into jb-mr1-dev 
* commit '5a12c0c863be5e8c0c76dd78130cd5695044f359':
  Add a minimum height of 64dp for AlertDialog content
 2012-09-17 14:45:44 -07:00
Dianne Hackborn
0ab7308e99 am 831f31c3: am b137c806: Merge "More adjustments to permissions." into jb-mr1-dev 
* commit '831f31c3883899eb57f28360bb51192937124081':
  More adjustments to permissions.
 2012-09-17 14:45:40 -07:00
Kenny Root
2eb5517f53 am 24310a61: am a40b2b34: Merge "Add test for failed dexopt" into jb-mr1-dev 
* commit '24310a619d429568f15bd2606ee9915812a3269f':
  Add test for failed dexopt
 2012-09-17 14:45:36 -07:00
rich cannings
088967f9bb am 35fc1145: am 97e7c59c: Merge "Enable package verification" into jb-mr1-dev 
* commit '35fc1145a56f0a739c3ba065499174f49d98a137':
  Enable package verification
 2012-09-17 14:45:32 -07:00
Iliyan Malchev
97fe30d658 am 793126fe: am 86e85efe: Merge "Set backlight brightness in correct order." into jb-mr1-dev 
* commit '793126fe63043d5f07d260ffed7ac938cd1f1a22':
  Set backlight brightness in correct order.
 2012-09-17 14:45:28 -07:00
Adam Powell
203f4c5f3f am f56f10c3: am 1f13a98c: Merge "Import panel background assets from UX" into jb-mr1-dev 
* commit 'f56f10c3da447067951c05da74762b8275b2bf03':
  Import panel background assets from UX
 2012-09-17 14:45:23 -07:00
rich cannings
8e58987e35 am 2357a77b: am 42af7518: Merge "Add setting to change verifier visibility" into jb-mr1-dev 
* commit '2357a77bf50413c8eb7f576a8b757b394e440edf':
  Add setting to change verifier visibility
 2012-09-17 14:45:16 -07:00
Adam Powell
67f3a40cc3 am bf78fc2a: am 89e68d78: Merge "Create main activity intents as needed for TaskStackBuilder/Up nav" into jb-mr1-dev 
* commit 'bf78fc2abfc15643f72ceb0f270e01ef900fb56f':
  Create main activity intents as needed for TaskStackBuilder/Up nav
 2012-09-17 14:45:10 -07:00
Irfan Sheriff
a8aead0a48 am e3dc7055: am 3849490c: Merge "Return empty scan results for background user" into jb-mr1-dev 
* commit 'e3dc7055cddbadc04e51003f17ab4dbdbb6f58df':
  Return empty scan results for background user
 2012-09-17 14:45:07 -07:00
Ying Wang
2ff9ab39d4 am 820600c2: am df5bdd72: Merge "Make librs_jni depend on libRSDriver to remove circular dependency" into jb-mr1-dev 
* commit '820600c2b3a8dc5145ec2984801cc68d61acc137':
  Make librs_jni depend on libRSDriver to remove circular dependency
 2012-09-17 14:45:01 -07:00
Adam Cohen
b9000abbe3 am c46b707e: am 62539859: Merge "Second pass on Keyguard multi-user switcher" into jb-mr1-dev 
* commit 'c46b707e660eabbde15c8e858477534e9e738c76':
  Second pass on Keyguard multi-user switcher
 2012-09-17 14:44:55 -07:00
John Huang
6d30ca0163 am 45c5089a: am 4505a43f: Merge "Add support for per-package policy for sending premium SMS." into jb-mr1-dev 
* commit '45c5089ab572155d1b0694c5f909072cbc29ad74':
  Add support for per-package policy for sending premium SMS.
 2012-09-17 14:44:50 -07:00
Victoria Lease
2fd0dcd38f am 6271654a: am 306df863: Merge "New location service permission strings." into jb-mr1-dev 
* commit '6271654a55c1a7aaec721c14ae6b0873033bad2b':
  New location service permission strings.
 2012-09-17 14:44:39 -07:00
Adam Powell
45ada3ac78 am 45937740: am b1861c3e: Minor fixes/clarifications for previous patch. 
* commit '4593774015ada7fb92f846fced136e487cd1e522':
  Minor fixes/clarifications for previous patch.
 2012-09-17 14:44:34 -07:00
Jim Miller
c2624e8c91 am d95129a7: am b45965f5: Merge "Fix keyguard timeout dialog messages" into jb-mr1-dev 
* commit 'd95129a76eb77d881ee138d7ae654ab01995733a':
  Fix keyguard timeout dialog messages
 2012-09-17 14:44:30 -07:00
Adam Powell
c86dae2337 am 3b6dc021: am 7db4eec5: Merge "Squish!" into jb-mr1-dev 
* commit '3b6dc021de2d19c021058df5af4fb8a05613d113':
  Squish!
 2012-09-17 14:44:26 -07:00
Craig Mautner
7ecd0387d2 am 2386be50: am a91f9e29: Make more items per-Display. 
* commit '2386be50d03df41d183fe0017c7560e078374439':
  Make more items per-Display.
 2012-09-17 14:44:18 -07:00
Dianne Hackborn
397c1d8467 am 0fd909ba: am d65afc65: Merge "More multi-user stuff." into jb-mr1-dev 
* commit '0fd909bad1151cc39061abb52ae5b8be090e05dd':
  More multi-user stuff.
 2012-09-17 14:44:10 -07:00
Dianne Hackborn
c2ce886339 am 6b655130: am 398bad04: Merge "Fix debug log." into jb-mr1-dev 
* commit '6b655130e7258da1aa40860e58852f9f5370bfbd':
  Fix debug log.
 2012-09-17 14:44:05 -07:00
Jeff Sharkey
40210f98ba am 06f01326: am d0c6ccba: Move NetworkPolicy from apps to UID. 
* commit '06f01326dfd9e2ee557fd817481081bc3f36e35e':
  Move NetworkPolicy from apps to UID.
 2012-09-17 14:43:36 -07:00
Jeff Sharkey
de878ea4e9 am a6bb5cd8: am ee100445: Updating public API. 
* commit 'a6bb5cd8d2a8daf7f5fdecb675c35bc1fd4459c5':
  Updating public API.
 2012-09-17 14:43:32 -07:00
Jeff Sharkey
e048529645 am d57f7dc4: am b3571a6c: Merge "Fix build" into jb-mr1-dev 
* commit 'd57f7dc4646617c30c1e2d11da32c4622807de87':
  Fix build
 2012-09-17 14:43:28 -07:00
Elliott Hughes
4ab0a648eb am cbcf02a8: am edf60d3d: Fix up symbols.xml. 
* commit 'cbcf02a84c51f5b4251f90fe1c7576f08f5afb19':
  Fix up symbols.xml.
 2012-09-17 14:43:24 -07:00
Elliott Hughes
89d2ce747d am fdd1b659: am c3ff72f5: Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings. 
* commit 'fdd1b6597bfcc7efc2d0cee4717253e40f718459':
  Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings.
 2012-09-17 14:43:21 -07:00
Elliott Hughes
d4d642c9e7 resolved conflicts for merge of 138ab322 to master 
Change-Id: I88155002a396dbe196de6178e7c2c16cfa30c819
 2012-09-17 14:34:50 -07:00
Baligh Uddin
9513aa7bab Merge "Import translations. DO NOT MERGE" 2012-09-17 14:26:19 -07:00
Elliott Hughes
8e15aba660 resolved conflicts for merge of c3fb4a16 to master 
Change-Id: I59f6bc36fcdac09c08ebe4510c5360464b4e7c01
 2012-09-17 14:12:31 -07:00
Baligh Uddin
78e148a0a7 Import translations. DO NOT MERGE 
Change-Id: Iac097c30e92b1e1550be710b3cc6705e1df7d29a
Auto-generated-cl: translation import
 2012-09-17 13:39:16 -07:00
Elliott Hughes
08870affdc resolved conflicts for merge of 8b1109a9 to master 
Change-Id: I37fff092e4e6534caa97e1af57da75818ea14b30
 2012-09-17 13:37:35 -07:00
Elliott Hughes
3405dbb7a7 am 0e29ed2e: am a8deafb4: Merge "Deprecate those parts of DateUtils the documentation says not to use." into jb-mr1-dev 
* commit '0e29ed2ed5c2b22a99474ad8b8414fade13a1ea9':
  Deprecate those parts of DateUtils the documentation says not to use.
 2012-09-17 12:47:10 -07:00
Christopher Tate
5067ea3751 am 5bae602c: am 2892dfbe: Merge "Fix default population of wifi settings" into jb-mr1-dev 
* commit '5bae602cbbb96af3290d430ab25600149d4d073d':
  Fix default population of wifi settings
 2012-09-17 12:47:03 -07:00
Daniel Sandler
dc5a1b8758 am 2dd7cb6f: am 8dd9206a: Fix NPE in rotation lock QS. 
* commit '2dd7cb6f6af8622c2b0b3c4f07466010f45b9460':
  Fix NPE in rotation lock QS.
 2012-09-17 12:46:59 -07:00
Geremy Condra
393760861d am 81953a34: am 74a550fa: Merge "Change verifyServerDomainAndCertificates to pass in a hostname." into jb-mr1-dev 
* commit '81953a3437c3af24dfb53cc7c106147d9a89be1f':
  Change verifyServerDomainAndCertificates to pass in a hostname.
 2012-09-17 12:46:56 -07:00
Kenny Root
24499c9e50 am 049005e3: am 1c9894aa: Merge "Remove AndroidKeyStore from API" into jb-mr1-dev 
* commit '049005e3c55b5f5dfda1c69482c6104d5931a2fc':
  Remove AndroidKeyStore from API
 2012-09-17 12:46:13 -07:00
Irfan Sheriff
e05c46df9c am 0c913cda: am 42496826: Merge "Fix suspend bugs" into jb-mr1-dev 
* commit '0c913cda955464d18f798eb47d7f8b19a46dfd35':
  Fix suspend bugs
 2012-09-17 12:46:08 -07:00
Elliott Hughes
7850a41871 am 42e7af25: am 9ceede6d: am 086676a4: am f5437ee8: am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use." 
* commit '42e7af25c06e2d1dbf8201d1ff1528311cf8c44e':
  Deprecate those parts of DateUtils the documentation says not to use.
 2012-09-17 12:45:47 -07:00
rich cannings
ecfc9d8253 am d063b14d: am 0b62fa23: Merge "Send more information to verifiers" into jb-mr1-dev 
* commit 'd063b14dc8ef3cdf63d658b5375bf84b5cb1dc02':
  Send more information to verifiers
 2012-09-17 12:45:31 -07:00
Svetoslav Ganov
f701d1eb71 am 873d49a6: am 8b681cb8: Some formatting missed in the previous patch 
* commit '873d49a670df369c6ad5d125581fdc182114d05b':
  Some formatting missed in the previous patch
 2012-09-17 12:45:18 -07:00