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

153883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wei Wang
34020eb6eb Merge "Add support of advertising through standard instance.(1/4)" into lmp-sprout-dev 2014-10-13 23:02:30 +00:00
Evan Charlton
1354a1fffe am f715da3d: Merge "Update the SDK AIDL list" into lmp-dev 
* commit 'f715da3d6b2c2d5037de69262eba513e863a98d8':
  Update the SDK AIDL list
 2014-10-13 22:28:29 +00:00
Evan Charlton
f715da3d6b Merge "Update the SDK AIDL list" into lmp-dev 2014-10-13 22:19:41 +00:00
Evan Charlton
b298a5a594 Update the SDK AIDL list 
Populate the framework.aidl list with .aidl files which are:
  - In the android.* namespace
  - Not marked @hide
  - Do not have their corresponding .java files marked @hide

Bug: 17952409
Change-Id: I1f4abf7abbc298a51605571cd168362dcc5603b2
 2014-10-13 15:12:57 -07:00
Sarah Maddox
64aec659b7 am 8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev 
* commit '8601b1b1ca75512177aa3539d33292250b5c9a2d':
  Fixed a typo in Perf Tips.
 2014-10-13 22:04:22 +00:00
Alan Viverette
21ad873231 am b927dfc7: Merge "Increase contrast for money permission" into lmp-dev 
* commit 'b927dfc774bd9d2c52cf6fbf50fe2eca16994c27':
  Increase contrast for money permission
 2014-10-13 22:04:15 +00:00
Elliott Hughes
c02ddd6a0a am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev 
* commit 'c130b428c5d7eb25dc7651c5cea82182f2241ddf':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
 2014-10-13 22:04:11 +00:00
Jeff Sharkey
c4d774d5d8 am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev 
* commit '461b3896babdbfb365282378df89cde2dddb5a3a':
  DocumentsUI: Add content description for nav.
 2014-10-13 22:04:06 +00:00
Jesse Hall
d4b38fe5c0 am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit '647e0df0c711cd53763367c86b15f10470eaeb6f':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-13 22:03:59 +00:00
Amit Mahajan
097c8d6011 am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '1901e175079e3b7242ace7d4b3ec38af3723f91b':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-13 22:03:52 +00:00
Sarah Maddox
8601b1b1ca Merge "Fixed a typo in Perf Tips." into lmp-dev 2014-10-13 21:50:30 +00:00
Alan Viverette
b927dfc774 Merge "Increase contrast for money permission" into lmp-dev 2014-10-13 21:31:40 +00:00
Elliott Hughes
c130b428c5 Merge "Ensure that the SIM language doesn't override the user language on the encryption UI." into lmp-dev 2014-10-13 20:55:30 +00:00
Jeff Sharkey
461b3896ba Merge "DocumentsUI: Add content description for nav." into lmp-dev 2014-10-13 20:31:04 +00:00
Jesse Hall
647e0df0c7 Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 2014-10-13 20:23:15 +00:00
Alan Viverette
dc4e791b29 Increase contrast for money permission 
BUG: 17923303
Change-Id: Ic35a9d37690ec5c4375285ca9b162cbff62db656
 2014-10-13 13:12:49 -07:00
Jeff Sharkey
b7b30f691c DocumentsUI: Add content description for nav. 
Bug: 17922955
Change-Id: I44c0107d8dd03aab36da55deeb864e328b492124
 2014-10-13 12:55:18 -07:00
Elliott Hughes
9c33f28d91 Ensure that the SIM language doesn't override the user language on the encryption UI. 
Bug: 17945169
Change-Id: I51e4f47c7cd925f3701f292b9022e467ccf95a17
 2014-10-13 12:39:56 -07:00
Amit Mahajan
1901e17507 Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 2014-10-13 19:32:36 +00:00
Yohei Yukawa
540861c925 am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev 
* commit '2dfd8d578a0c5b90ee10ce1f3ddb4aeb0e948f60':
  Update config when "Show input method" is changed
 2014-10-13 18:48:16 +00:00
Mike Lockwood
8ca4886e43 am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 
* commit '317f9ce85a492a213b8f1dac477b1aefad55f621':
  Change RECEIVE_BLUETOOTH_MAP permission to signature or system
 2014-10-13 18:48:11 +00:00
Michael Wright
43a7dcc12b am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev 
* commit '265d3e9d3eb6915d9ca9da5fcd1ddb29b5f8bc3b':
  Clean-up ColorFade's shaders and buffers.
 2014-10-13 18:48:07 +00:00
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
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
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
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
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
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
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
Sarah Maddox
3cceb24414 Fixed a typo in Perf Tips. 
Change-Id: I427bd60211d6fa3f2d1f262dc2b9b8e7729d4adc
 2014-10-13 15:51:43 +11: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
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
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
Joe Fernandez
f666355b2d docs: migrate TV Playback app content 
Change-Id: I851dac6423cba3b76c85e1ac5b6c03a98272d868
 2014-10-12 19:06:55 -07:00