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

148490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandra Gherghina
7c97bbc39f Bugfix: adds extra null check 
Bug: 16976436
Change-Id: Id51fd3125b4e68ff7c0ec37ec031fcb8ff882ed4
 2014-08-12 17:22:20 +00:00
Deepanshu Gupta
b0a297a9b7 am ffd4e5ba: Merge "Improve error reporting when renaming fonts." into lmp-dev 
* commit 'ffd4e5ba26bf05d5f23f8b9438fe7db0425805e3':
  Improve error reporting when renaming fonts.
 2014-08-12 17:19:06 +00:00
Deepanshu Gupta
73d7fa906d am 266828ff: Merge "Don\'t show warnings for fonts not bundled." into lmp-dev 
* commit '266828ff627ec65a25bde7dc3c52bdad0d4442b3':
  Don't show warnings for fonts not bundled.
 2014-08-12 17:19:01 +00:00
Deepanshu Gupta
09e36b9764 am a061e080: Merge "Resolve color xml attributes properly." into lmp-dev 
* commit 'a061e080d21fd095648f6d5d693241e73020e033':
  Resolve color xml attributes properly.
 2014-08-12 17:18:56 +00:00
Baligh Uddin
bd2916d89c am 348e04b1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '348e04b12b5d059d4e86bce022937d4688e98faa':
  Import translations. DO NOT MERGE
 2014-08-12 16:57:53 +00:00
Baligh Uddin
3ca64d3133 am af5fc7fc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'af5fc7fc4fa0b807693be4490e9fd0a77acabe68':
  Import translations. DO NOT MERGE
 2014-08-12 16:57:49 +00:00
Baligh Uddin
260168a781 am 493285fd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '493285fdb459a6044acd250dc779d2dc57760dc3':
  Import translations. DO NOT MERGE
 2014-08-12 16:57:45 +00:00
Baligh Uddin
72ee579a4b am 55f3bb6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '55f3bb6c5da343730825838d194f1a6963dfbf27':
  Import translations. DO NOT MERGE
 2014-08-12 16:57:41 +00:00
Selim Cinek
ccd14fbcfe Reset the notification expanded states on screen off 
To avoid having expanded notifications sticking around

Bug: 16005498
Change-Id: Ib5b184fa7eb67ada85305e7ca4afad68a1514327
 2014-08-12 16:56:40 +00:00
Sailesh Nepal
c28aceb11e Merge "Override StatusHints.equals" into lmp-dev 2014-08-12 16:55:45 +00:00
Sailesh Nepal
f20b9166ee Override StatusHints.equals 
Bug: 16979621
Change-Id: I858a4718a8815be18214400d3bc1d9054b99434e
 2014-08-12 11:53:32 -07:00
Deepanshu Gupta
14690b0aa3 Merge "Improve error reporting when renaming fonts." into lmp-dev 2014-08-12 16:54:46 +00:00
Jean-Michel Trivi
bab0111ef0 Merge "HDMI plug intent and associated information" into lmp-dev 2014-08-12 16:54:46 +00:00
Jean-Michel Trivi
37d7804627 HDMI plug intent and associated information 
Read HDMI device information from audio ports and add it as
 extras in the connection intent.
Document the new extras in the connection intent.
Make Intent.ACTION_HDMI_AUDIO_PLUG public.

Bug 10549017

Change-Id: I6236b5363f00c433e443195fae8c43af2fc834f7
 2014-08-12 17:16:30 +00:00
Deepanshu Gupta
556f941f55 Merge "Don't show warnings for fonts not bundled." into lmp-dev 2014-08-12 16:54:46 +00:00
RoboErik
e78824fda7 am caffb908: Merge "Fix registering global priority sessions" into lmp-dev 
* commit 'caffb9088f126dcb85fb17a868617b9604cc29b6':
  Fix registering global priority sessions
 2014-08-12 16:41:43 +00:00
Selim Cinek
3c14b49cf2 am 18cfb2a8: Merge "Fixed a bug where a notification had no background" into lmp-dev 
* commit '18cfb2a861fd321d27ede37f8f2a53c967ab485d':
  Fixed a bug where a notification had no background
 2014-08-12 16:04:12 +00:00
Robin Lee
4ed80f1e85 am 40bdb1f7: Clean up DevicePolicyManager CA certificate APIs 
* commit '40bdb1f7b345968b98bc710e8304ea69f560b4b9':
  Clean up DevicePolicyManager CA certificate APIs
 2014-08-12 16:04:07 +00:00
Robin Lee
7e67871174 Clean up DevicePolicyManager CA certificate APIs 
For consistency all CA-related methods now require the ComponentName
of a DeviceAdminReceiver as the first parameter. Updated javadoc for
this and added in some more detail about the methods in general as
well.

Created two new utility APIs,one to list all installed CAs and one to
remove all installed (user) CAs. Deleted old hasAnyCaCertsInstalled
method because it is now redundant.

@bug 16488006

Change-Id: I55eec17e01489ab323f8a0e68b11592605a7b740
 2014-08-12 16:54:40 +01:00
George Mount
ad2d57073a am 0fb5d38b: Merge "Pass elevation to enable shadow in shared elements." into lmp-dev 
* commit '0fb5d38b78554cafb055e00a10b0dfd50a878026':
  Pass elevation to enable shadow in shared elements.
 2014-08-12 14:39:22 +00:00
Sungsoo Lim
5d688caf64 am de4084d3: Add equals method of TvContentRating 
* commit 'de4084d34c1ef070a6b0da918d9809aca8b14f59':
  Add equals method of TvContentRating
 2014-08-12 14:26:22 +00:00
Sungsoo Lim
1681ac0b69 Add equals method of TvContentRating 
Bug: 16963556
Change-Id: I09869d322fc2056ef1df5d2ca95891263646b46f
 2014-08-12 22:48:28 +09:00
Jaewan Kim
3c6b48a1a0 am 1de7bb2d: Merge "Treat empty subrating as the same as null subratings." into lmp-dev 
* commit '1de7bb2d0d82817083b12e71f9907e26371c7eb9':
  Treat empty subrating as the same as null subratings.
 2014-08-12 13:32:30 +00:00
Sungsoo Lim
3e39146c8b am a1424732: Merge "Add version attribute in tv_content_rating_system.xml" into lmp-dev 
* commit 'a14247320ee1bf3aee15ad71068e52a8dea88a58':
  Add version attribute in tv_content_rating_system.xml
 2014-08-12 13:06:18 +00:00
Selim Cinek
5748fcffce am df178596: Merge "Fixed a ordering bug with the notification shade" into lmp-dev 
* commit 'df17859676ea70cbd0ab03c3dcdce28737661377':
  Fixed a ordering bug with the notification shade
 2014-08-12 12:46:20 +00:00
Selim Cinek
93f6b7ef54 am c294cdf1: Fixed a jump in the stack scroller algorithm 
* commit 'c294cdf1972f39375fa934a8ee2552a20c3b9258':
  Fixed a jump in the stack scroller algorithm
 2014-08-12 12:11:15 +00:00
Selim Cinek
4581cf8206 Fixed a jump in the stack scroller algorithm 
The bottom stack jumped slightly when scrolling in landscape.

Bug: 16954513
Change-Id: I11ed9074cf5286b01f4f57ce37b4476c2ee9cd7e
 2014-08-12 10:50:55 +00:00
Yuncheol Heo
132c72b76c am 2f980820: Merge "Use the system property for the HdmiControlService configuration." into lmp-dev 
* commit '2f98082046884b754bc4e7c89c46f2999a2e8b8a':
  Use the system property for the HdmiControlService configuration.
 2014-08-12 08:52:19 +00:00
Wonsik Kim
62cb2f8963 am 85e21042: Merge "TIF: small refactoring around audio configuration update" into lmp-dev 
* commit '85e21042150ce0a7903807685b0973812b4d81c4':
  TIF: small refactoring around audio configuration update
 2014-08-12 08:52:14 +00:00
Jinsuk Kim
879e9eac74 am daafdbb1: Merge "CEC: Fix two bugs" into lmp-dev 
* commit 'daafdbb10f4c35824a3e35ecb14d9f8759e0688b':
  CEC: Fix two bugs
 2014-08-12 07:10:08 +00:00
Jungshik Jang
934733df4e am 663006eb: Merge "Set active port path to HdmiControlService" into lmp-dev 
* commit '663006ebab102cd66fe4fc8318ca69b0d8810a68':
  Set active port path to HdmiControlService
 2014-08-12 05:29:30 +00:00
Amit Mahajan
7915e1b3fc am 19341807: Revert "add apn setting parameters, and set apn parameters to bp" 
* commit '193418074ad85878121776ebf316367ad53d2039':
  Revert "add apn setting parameters, and set apn parameters to bp"
 2014-08-12 05:23:07 +00:00
Jinsuk Kim
15ccc2d33a am c7410e7c: Merge "CEC: Make sure CEC switch info is always updated" into lmp-dev 
* commit 'c7410e7cad4c919dbf6301373de437d6559a4016':
  CEC: Make sure CEC switch info is always updated
 2014-08-12 05:16:26 +00:00
Amit Mahajan
ff2efd5299 Revert "add apn setting parameters, and set apn parameters to bp" 
This reverts commit 3fd217b3f492c95c8550da2a36fffbc6f3a3b724.

Change-Id: Icf32debc07b858c5ae2eb8a7bf4a6e95445a7466
 2014-08-12 05:14:36 +00:00
Baligh Uddin
deb6799eee Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-12 04:17:55 +00:00
Baligh Uddin
f8aaf710d9 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-12 04:17:55 +00:00
George Mount
8d2ba6dac3 Merge "Pass elevation to enable shadow in shared elements." into lmp-dev 2014-08-12 04:17:55 +00:00
Jeff Davidson
ed28f122f9 am b44d70ab: Merge "Security-related cleanup for network scoring." into lmp-dev 
* commit 'b44d70abf1ffc57faf16482d24f48247a0c547f2':
  Security-related cleanup for network scoring.
 2014-08-12 03:43:00 +00:00
Ihab Awad
8ced27287a am 09c8e122: Merge "Fix incorrect connection ID for remote connection service" into lmp-dev 
* commit '09c8e1222eef1bedaad6e980bde25d216884bee0':
  Fix incorrect connection ID for remote connection service
 2014-08-12 03:35:06 +00:00
Barnaby James
5e9e5890d7 am 475b1098: Merge "Fix VoiceInteractionService.isActiveService()." into lmp-dev 
* commit '475b10980cfd608fe808ca95bc005f852cddef05':
  Fix VoiceInteractionService.isActiveService().
 2014-08-12 02:43:21 +00:00
Jeff Sharkey
5c08d6dbd9 am dd28d64f: Merge "Hack and ship: NetworkStats edition." into lmp-dev 
* commit 'dd28d64fa41c81a8968bd0eaf0a36bbb2bb21629':
  Hack and ship: NetworkStats edition.
 2014-08-12 02:37:29 +00:00
Jungshik Jang
316b078e27 am 421e88b7: Merge "Hook up native mhl api to HdmiControl Service." into lmp-dev 
* commit '421e88b7296511be45cf0cd2799500b40188d7a2':
  Hook up native mhl api to HdmiControl Service.
 2014-08-12 02:37:23 +00:00
Chelsea Derrick
f6043b14f4 am 7ec2600c: Merge "Revert "Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]"" into lmp-dev 
* commit '7ec2600c39f8d7e91b14f59dc15af480deee7e85':
  Revert "Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]"
 2014-08-12 02:25:32 +00:00
Deepanshu Gupta
93b1483e57 Improve error reporting when renaming fonts. 
Log a better error in case of invalid input.

Change-Id: Ifb122c1cc624111769e650439aa24290155dbbc4
 2014-08-11 18:48:53 -07:00
Deepanshu Gupta
e644ff8d92 Don't show warnings for fonts not bundled. 
The extended font set, used on Nexus 5, new Nexus 7 etc., uses OpenType
CFF fonts which don't work well with Java. These fonts are deliberately
excluded from the SDK build.

This change skips the warnings for the missing fonts. However, we still
show warnings for other fonts that failed to load. If the set of fonts
bundled with the SDK changes, we will need to update the list of missing
fonts in FontFamily_Delegate.java.

Change-Id: I3197b5350d048daa09512e8024188909179b1799
 2014-08-11 18:11:37 -07:00
Hui Wang
9a542ca804 am 3fd217b3: add apn setting parameters, and set apn parameters to bp 
* commit '3fd217b3f492c95c8550da2a36fffbc6f3a3b724':
  add apn setting parameters, and set apn parameters to bp
 2014-08-12 01:02:33 +00:00
Hui Wang
fdd78e06a7 add apn setting parameters, and set apn parameters to bp 
Change-Id: I2720b6f8eba707691b9c3f481b6182c98ae3f10b
 2014-08-12 00:44:40 +00:00
John Spurlock
a24cb1f959 am 1a38c8b1: Talkback: Ensure TTS stream is not affected by ringer mode. 
* commit '1a38c8b12ac99cd23fbee37cc15021e782fefbe3':
  Talkback: Ensure TTS stream is not affected by ringer mode.
 2014-08-12 00:44:02 +00:00
Jeff Davidson
328e679b21 Merge "Security-related cleanup for network scoring." into lmp-dev 2014-08-12 00:32:51 +00:00
Jeff Sharkey
93f871126c Merge "Hack and ship: NetworkStats edition." into lmp-dev 2014-08-12 00:32:51 +00:00