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

155093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
ad12f288b1 am 02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '02c4a225ffa32e67255517a0275d7a4c1a738619':
  Import translations. DO NOT MERGE
 2014-10-13 18:48:03 +00:00
Yohei Yukawa
2dfd8d578a Merge "Update config when "Show input method" is changed" into lmp-dev 2014-10-13 18:42:50 +00:00
Mike Lockwood
317f9ce85a Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 2014-10-13 18:38:23 +00:00
Amit Mahajan
5742335cbd Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to 
signatureOrSystem.

Bug: 17952946
Change-Id: I4a75da11cb092ca795d0eacf824890eb12c7446a
 2014-10-13 11:38:03 -07:00
Jesse Hall
d7e559675c Surface: Leave object in unlocked state when unlockCanvasAndPost fails 
If nativeUnlockCanvasAndPost() throws, Surface was maintaining a
reference to the native Surface, and assuming it was still locked.
That would cause future lockCanvas() calls to throw without even
trying to lock the native Surface, even though in some cases the
native lock was actually released before the exception was thrown.

Now Surface treats the native object as unlocked even if
nativeUnlockCanvasAndPost() throws, so it will attempt the native lock
on lockCanvas() rather than assuming it would fail.

This change also changes an IllegalStateException to
IllegalArgumentException in unlockCanvasAndPost(). That exception was
added in KitKat, and was never documented or added to the throws
declaration. This was essentially a silent public API change. Quite a
bit of code in the framework (and likely in applications) catches
IAE from this method, but didn't attempt to handle ISE. Although ISE
is more correct here, it's not worth breaking code (and it did -- in
this bug it changed a problem that should have been silently and
perfectly recovered from into a fatal exception in system_server.)

Bug: 17684556
Change-Id: Ia8d3e5d33eaa690d16c7d0f557390c7bb4e1e32e
 2014-10-13 11:01:15 -07:00
Geoff Mendal
1b77f365d6 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-13 17:31:34 +00:00
Michael Wright
265d3e9d3e Merge "Clean-up ColorFade's shaders and buffers." into lmp-dev 2014-10-13 17:30:32 +00:00
Geoff Mendal
d6a85f6e84 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-13 17:28:23 +00:00
Jeff Hao
1d892dcb6b Stop boot dexopt when low on memory. 
Bug: 17641843
Change-Id: Ie1967fc2cd9bdd258bfee442968f98200edaf62e
 2014-10-13 10:27:29 -07:00
Geoff Mendal
02c4a225ff Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-13 17:22:40 +00:00
Geoff Mendal
aaefa5963e Import translations. DO NOT MERGE 
Change-Id: I089e715e2d5e9c3533ddfbcd9a8773e5d4badd86
Auto-generated-cl: translation import
 2014-10-13 10:15:50 -07:00
Geoff Mendal
b54c175e32 Import translations. DO NOT MERGE 
Change-Id: I6ee9fab7b3887858319cb14b34a19062d72cd6b3
Auto-generated-cl: translation import
 2014-10-13 10:08:58 -07:00
Geoff Mendal
84323907e4 Import translations. DO NOT MERGE 
Change-Id: I0248efd41328adc6acd19fb84131fc4d7606b774
Auto-generated-cl: translation import
 2014-10-13 10:05:28 -07:00
Mike Lockwood
6e383350e4 Change RECEIVE_BLUETOOTH_MAP permission to signature or system 
Bug: 17954105
Change-Id: I8b16cab7193c97e5f54d6e4ef33ebf8cda0da197
 2014-10-13 10:00:08 -07:00
Geoff Mendal
2bb933a512 am 862ecfa3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '862ecfa38a5df179bcacf7e5f0c8c2cfef994193':
  Import translations. DO NOT MERGE
 2014-10-13 14:20:20 +00:00
Geoff Mendal
862ecfa38a Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-13 14:17:23 +00:00
Geoff Mendal
59f3f45b5b Import translations. DO NOT MERGE 
Change-Id: Iefa534c5aef2a7e43adf030b844d91a64bd90976
Auto-generated-cl: translation import
 2014-10-13 07:16:34 -07:00
Geoff Mendal
a362bacb16 am 39217055: (-s ours) am d700e5a3: (-s ours) Import translations. DO NOT MERGE 
* commit '39217055fad3ee87bf912ac9a2ad7b186cf73eb4':
  Import translations. DO NOT MERGE
 2014-10-13 14:07:49 +00:00
Geoff Mendal
810e048690 Import translations. DO NOT MERGE 
Change-Id: I975ab75d40dbb3629bd36e94058cfd4053053929
Auto-generated-cl: translation import
 2014-10-13 07:03:56 -07:00
Geoff Mendal
39217055fa am d700e5a3: (-s ours) Import translations. DO NOT MERGE 
* commit 'd700e5a37afec6c264609c5df4c3a6b783417330':
  Import translations. DO NOT MERGE
 2014-10-13 14:03:04 +00:00
Geoff Mendal
d700e5a37a Import translations. DO NOT MERGE 
Change-Id: Ic3cbd08f31920de16f0d21c846cde2ded2b2e3ec
Auto-generated-cl: translation import
 2014-10-13 06:57:32 -07:00
Marcin Kosiba
58ee8a966a am 4f3ee426: am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev 
* commit '4f3ee426f62662f590c056ce44f005cd716f9870':
  Remove the default WebView text encoding resource entirely.
 2014-10-13 09:47:01 +00:00
Marcin Kosiba
4f3ee426f6 am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev 
* commit '437517573b53b17765eba9b0b98055915bf3a4a1':
  Remove the default WebView text encoding resource entirely.
 2014-10-13 09:42:58 +00:00
Marcin Kosiba
437517573b Merge "Remove the default WebView text encoding resource entirely." into lmp-dev 2014-10-13 09:37:36 +00:00
Joe Fernandez
843fe45127 am e0b0d9a2: am 7e522af6: Merge "docs: Move the L-Developer Preview samples page to the Developer Samples area" into lmp-dev 
* commit 'e0b0d9a2dcfc53bb8794271081ca3b15e9792bee':
  docs: Move the L-Developer Preview samples page to the Developer Samples area
 2014-10-13 05:44:25 +00:00
Joe Fernandez
074c1d9313 am 26ebde60: am cd2445a9: docs: Migrate TV Design docs to main DAC-Design area 
* commit '26ebde60d2cd1022e858061f74030ef2e8b4f134':
  docs: Migrate TV Design docs to main DAC-Design area
 2014-10-13 05:44:21 +00:00
Joe Fernandez
e0b0d9a2dc am 7e522af6: Merge "docs: Move the L-Developer Preview samples page to the Developer Samples area" into lmp-dev 
* commit '7e522af60ffc3de9d809a82808bf93eba9917d32':
  docs: Move the L-Developer Preview samples page to the Developer Samples area
 2014-10-13 05:40:35 +00:00
Joe Fernandez
26ebde60d2 am cd2445a9: docs: Migrate TV Design docs to main DAC-Design area 
* commit 'cd2445a9aa1159dead4107a770b898c8305aed19':
  docs: Migrate TV Design docs to main DAC-Design area
 2014-10-13 05:40:31 +00:00
Joe Fernandez
7e522af60f Merge "docs: Move the L-Developer Preview samples page to the Developer Samples area" into lmp-dev 2014-10-13 05:37:00 +00:00
Joe Fernandez
cd2445a9aa docs: Migrate TV Design docs to main DAC-Design area 
Change-Id: Ie9ba7e519ccdf46b58010d5ff11b4042134b7a57
 2014-10-12 22:31:41 -07:00
Jinsuk Kim
e46fdb43c0 Merge "CEC: Queue actions for starting later when not ready" into lmp-mr1-dev 2014-10-13 05:16:11 +00:00
Sarah Maddox
3cceb24414 Fixed a typo in Perf Tips. 
Change-Id: I427bd60211d6fa3f2d1f262dc2b9b8e7729d4adc
 2014-10-13 15:51:43 +11:00
Joe Fernandez
96eecf4f06 am d942d4e9: am 15edcda5: docs: migrate Android TV games page to TV training section 
* commit 'd942d4e93b8e3f7fecab1bee2ae41b0fc69d940c':
  docs: migrate Android TV games page to TV training section
 2014-10-13 04:49:36 +00:00
Joe Fernandez
d942d4e93b am 15edcda5: docs: migrate Android TV games page to TV training section 
* commit '15edcda56ba12ad04a286f4d07f2b6fe0b1c5e38':
  docs: migrate Android TV games page to TV training section
 2014-10-13 04:45:34 +00:00
Joe Fernandez
15edcda56b docs: migrate Android TV games page to TV training section 
Change-Id: Ic6be9deaac5ad2516dba288c0c3d059e3c7a6118
 2014-10-12 21:38:05 -07:00
Joe Fernandez
4fd3cd1493 am f0acbc15: am e6b9abb3: docs: migrate Android TV content discovery 
* commit 'f0acbc154d1b31240ea8a4b21186667c7dcbf897':
  docs: migrate Android TV content discovery
 2014-10-13 04:01:02 +00:00
Joe Fernandez
f0acbc154d am e6b9abb3: docs: migrate Android TV content discovery 
* commit 'e6b9abb3ad06d32e76a07e733e0a6554479fbfa4':
  docs: migrate Android TV content discovery
 2014-10-13 03:56:42 +00:00
Joe Fernandez
25b9e36372 am bb8e826c: am f666355b: docs: migrate TV Playback app content 
* commit 'bb8e826c299e0ca3c83d8befeaa8f64becbf5acc':
  docs: migrate TV Playback app content
 2014-10-13 03:51:07 +00:00
Joe Fernandez
e6b9abb3ad docs: migrate Android TV content discovery 
Change-Id: I35fe1e7f4f60409a0f7c5cd5bfc8ccfede4d6c20
 2014-10-12 20:45:47 -07:00
Joe Fernandez
bb8e826c29 am f666355b: docs: migrate TV Playback app content 
* commit 'f666355b2d9dbffffa640aff7731a8ba8309eaaa':
  docs: migrate TV Playback app content
 2014-10-13 03:29:40 +00:00
Jinsuk Kim
8ea712f44b Merge "CEC: Do not publish the service if native/HAL is not ready" into lmp-mr1-dev 2014-10-13 02:41:48 +00:00
Jinsuk Kim
6f87b4e6b6 CEC: Queue actions for starting later when not ready 
Requests coming in while the service is still being brought up
were discarded. Changed to queue them so that they can be started
after the initialization is completed.

Bug: 17933899
Change-Id: Ic9d9cd2094b830c80dec54dd5ef6a18159a74dc7
 2014-10-13 11:38:16 +09:00
Joe Fernandez
f666355b2d docs: migrate TV Playback app content 
Change-Id: I851dac6423cba3b76c85e1ac5b6c03a98272d868
 2014-10-12 19:06:55 -07:00
Jinsuk Kim
08f1ab02d6 CEC: Do not publish the service if native/HAL is not ready 
This helps detect the issue sooner by checking the availability
of the service and avoid crashing at a later point.

Bug: 17897529
Change-Id: Iab0eeffb00221e5a7e6e36d446eeef7c92da1f82
 2014-10-13 10:44:50 +09:00
Joe Fernandez
62d8c4b06c am fd74a901: am d86a2f5b: docs: Android TV App Dev Basic Training 
* commit 'fd74a901f7ba78b618e1033fdc71af6f7f38bf0c':
  docs: Android TV App Dev Basic Training
 2014-10-13 00:41:59 +00:00
Joe Fernandez
fd74a901f7 am d86a2f5b: docs: Android TV App Dev Basic Training 
* commit 'd86a2f5b344a6c3520ab05c02df8a5b3fdfa5aea':
  docs: Android TV App Dev Basic Training
 2014-10-13 00:35:17 +00:00
Joe Fernandez
d86a2f5b34 docs: Android TV App Dev Basic Training 
Change-Id: Iede448652efba25c3d0b6c26d49ea6548008515e
 2014-10-12 17:29:44 -07:00
Joe Fernandez
e26c4d2f90 docs: Move the L-Developer Preview samples page to the Developer Samples area 
Change-Id: I307acca1dd3105768ed5c72995b1c7e67bea0612
 2014-10-12 11:33:04 -07:00
Ihab Awad
6d39d66900 am f5afb4d6: Revert "Add color to PhoneAccount objects (1/3)" 
* commit 'f5afb4d617d591225cc504b52ba9b6f1605a5c87':
  Revert "Add color to PhoneAccount objects (1/3)"
 2014-10-12 04:33:12 +00:00
Ihab Awad
f5afb4d617 Revert "Add color to PhoneAccount objects (1/3)" 
This reverts commit 0000cd81c84d73d3f878cd581fb89b7ea257a05a.
 2014-10-11 17:16:39 -07:00