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

120203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
ab0c43a458 am 15fdce9d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '15fdce9d65b47e2b92bcac78776cc01486cff61a':
  Import translations. DO NOT MERGE
 2014-04-04 14:30:52 +00:00
Baligh Uddin
15fdce9d65 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2014-04-04 14:25:47 +00:00
Deepanshu Gupta
53ccdf1894 am ef5caff8: am c0086ba5: am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'ef5caff8b53f3b8ce85277824f14936047bc11d5':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 02:21:45 +00:00
Deepanshu Gupta
5f9887e6f1 am e18ae130: am 0bb7ec7e: am d8b890da: (-s ours) am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'e18ae1303c070759bce117b969186f699baa8564':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 02:21:42 +00:00
Deepanshu Gupta
3e4aebdbfc am eca9620e: am 0c44762f: am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'eca9620e331d72afa933252dc7adb1ae3ed4d692':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 02:21:39 +00:00
Deepanshu Gupta
2deb31ffbe am f1973ae2: am a1cca5cb: am 29b4986e: (-s ours) am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'f1973ae2107b2202cc7a2436ef1cf941cbfd9ff6':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 02:21:35 +00:00
Deepanshu Gupta
6acadebe8b am 74ad989d: am 77596103: am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit '74ad989de6e5d62791edf15ebdbe45194cba3530':
  Fix layoutlib [DO NOT MERGE]
 2014-04-04 02:21:32 +00:00
Deepanshu Gupta
a53466479c am 14dee803: am c7fdfe6b: am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '14dee803f8a3b532e86613bb18d5cb572d113df9':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 02:21:29 +00:00
Deepanshu Gupta
ef5caff8b5 am c0086ba5: am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'c0086ba57f3bba1f9139baf72ed38f79f3e4ac02':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 02:14:12 +00:00
Deepanshu Gupta
e18ae1303c am 0bb7ec7e: am d8b890da: (-s ours) am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '0bb7ec7ef9523a8e87878251ae0a0502b66e3706':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 02:14:10 +00:00
Deepanshu Gupta
eca9620e33 am 0c44762f: am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '0c44762ffee58dbcd526ad173934e3ff48fb9ff9':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 02:14:07 +00:00
Deepanshu Gupta
f1973ae210 am a1cca5cb: am 29b4986e: (-s ours) am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'a1cca5cb0b7ad982983aebac980c4a44827e7eb3':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 02:14:04 +00:00
Deepanshu Gupta
74ad989de6 am 77596103: am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit '77596103b82939887901b04c9a46fab746ad63a7':
  Fix layoutlib [DO NOT MERGE]
 2014-04-04 02:14:01 +00:00
Deepanshu Gupta
14dee803f8 am c7fdfe6b: am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'c7fdfe6b67d81a62d79912780b585673043148ab':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 02:13:59 +00:00
Deepanshu Gupta
c0086ba57f am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 
* commit '9bcfee1d3ebe9704937e6935ffe7eabd46ebbf08':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 02:07:45 +00:00
Deepanshu Gupta
0bb7ec7ef9 am d8b890da: (-s ours) am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'd8b890da785e386f08e0a3cf6b7094a23af3c8f2':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 02:07:42 +00:00
Deepanshu Gupta
0c44762ffe am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '8152502e93edfe2f50d678d6860d3c7d1a8b4865':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 02:07:39 +00:00
Deepanshu Gupta
a1cca5cb0b am 29b4986e: (-s ours) am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '29b4986ecce1592bd2fe62024bb187dded33c0af':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 02:07:36 +00:00
Deepanshu Gupta
77596103b8 am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit 'ce393373b73e1a1f30ce9bb41568d415cab7df49':
  Fix layoutlib [DO NOT MERGE]
 2014-04-04 02:07:32 +00:00
Deepanshu Gupta
c7fdfe6b67 am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '99939cce702b6b5a01be351f1a0b406a16509103':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 02:07:28 +00:00
Deepanshu Gupta
9bcfee1d3e am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 
* commit '30e59135b11d196cac2edd97d1ccca3471f3e398':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 02:01:58 +00:00
Deepanshu Gupta
d8b890da78 am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'af60289e692b6b598d550371cc6e41e0b40dd6cd':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 02:01:55 +00:00
Deepanshu Gupta
8152502e93 am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '07d5f94e6b8a6d3f9caca057830e5cbd4cfa7dac':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 02:01:51 +00:00
Deepanshu Gupta
29b4986ecc am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '5c77c126b258924961a4a9c784177b4bcd403dd0':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 02:01:48 +00:00
Deepanshu Gupta
ce393373b7 am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit 'ef9f3043f5259fa55376a1522152779295e15da6':
  Fix layoutlib [DO NOT MERGE]
 2014-04-04 02:01:45 +00:00
Deepanshu Gupta
99939cce70 am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '6094daa2626e57c6bd24409f0934090581541e49':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 02:01:42 +00:00
Deepanshu Gupta
30e59135b1 am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'c07a48bed2c772dc548423396b208331b22a679a':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 01:54:13 +00:00
Deepanshu Gupta
af60289e69 am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '70dfe865013f0c8fedf2c9468360a41b02fcce0a':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 01:54:10 +00:00
Deepanshu Gupta
07d5f94e6b am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '2eb5f9e5b25dc769e5ba205237097c67fa212fd6':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 01:54:08 +00:00
Deepanshu Gupta
5c77c126b2 am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'b6588c522451f5015c2cbc902d5a72566f979f2b':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 01:54:05 +00:00
Deepanshu Gupta
ef9f3043f5 am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit '3bc5b23f8dbb6ecc4eeac4334f94682056d0cb3b':
  Fix layoutlib [DO NOT MERGE]
 2014-04-04 01:54:03 +00:00
Deepanshu Gupta
6094daa262 am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'ba0ce05688ff7ebf91e16f5cb741701feb706fc2':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 01:54:00 +00:00
Deepanshu Gupta
c07a48bed2 Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:45:45 +00:00
Deepanshu Gupta
70dfe86501 Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:45:29 +00:00
Deepanshu Gupta
2eb5f9e5b2 Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:45:13 +00:00
Deepanshu Gupta
b6588c5224 Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:44:02 +00:00
Deepanshu Gupta
3bc5b23f8d Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:43:48 +00:00
Deepanshu Gupta
ba0ce05688 Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:43:08 +00:00
Xavier Ducrohet
76c484de88 am d93b0b67: am e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev 
* commit 'd93b0b67754f6d06407086278298f44156458216':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-04-03 22:17:10 +00:00
Xavier Ducrohet
d93b0b6775 am e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev 
* commit 'e448bcf71adec7b94e2a67ed06d0a725b80c31d8':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-04-03 22:10:38 +00:00
Xavier Ducrohet
e448bcf71a Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev 2014-04-03 22:05:25 +00:00
Jeff Brown
8db6d9af58 Merge "Clean up certain state transitions in DreamService." into klp-modular-dev 2014-04-03 03:20:01 +00:00
Jeff Brown
344812d2f3 Clean up certain state transitions in DreamService. 
Instead of posting onDreamingStarted() to a handler from attach(), do
the work immediately.  This ensures that the dream is actually in the
expected state when the callback runs.  Previously it was possible
for the callback to run after detach() occurred which could cause
exceptions and unexpected behavior.  As it happens, there's no need
to post this callback since attach() already runs on the UI thread.

Handle certain races involving the window token lifecycle a little
better.  When the dream manager shuts down a dream, it removes the
window token.  This can happen before the dream completes its attach()
phase in which case a BadTokenException is thrown.  We now handle this
exception and abort the dream in anticipation of receiving a request
to finish it immediately.

Add a safeguard to getDozeHardware() to handle the case where it
might inadvertently be called at the wrong point in the lifecycle.

Bug: 13475612
Bug: 13760290
Change-Id: I9bc9c154370d08d7727b568d398c460a38592099
 2014-04-02 20:17:32 -07:00
Jeff Tinker
4995d72520 Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev 2014-04-03 01:30:42 +00:00
Jinsuk Kim
31518f745f Merge "Use build property for CEC device OSD name" into klp-modular-dev 2014-04-03 00:35:09 +00:00
Jeff Tinker
65c94e6959 Add signature|system permission to MediaDrm signer APIs 
Also addresses style issues noted in post-submit review from
https://googleplex-android-review.git.corp.google.com/#/c/439054/

Change-Id: If177b11dbcc049bc271529c119bc5c36ae0107b5
related-to-bug: 12702350
 2014-04-02 16:43:10 -07:00
Jinsuk Kim
7b4c972577 Merge "Fix build breakage by updating current.txt" into klp-modular-dev 2014-04-02 23:12:09 +00:00
Katie McCormick
85588d19bd am cd536cb3: am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs 
* commit 'cd536cb32927d74ac8181c8636f2971cb39e7fda':
  docs: MediaRouteProvider Developer Guide
 2014-04-02 23:11:20 +00:00
Jinsuk Kim
196b6dd13e Fix build breakage by updating current.txt 
Change-Id: If9434850c24c8e97bdd49952fb3180d139cab101
 2014-04-03 08:10:55 +09:00
Katie McCormick
cd536cb329 am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs 
* commit '0cdf60472be5efc1b6e8ef125f96ba014870b345':
  docs: MediaRouteProvider Developer Guide
 2014-04-02 23:05:04 +00:00