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

149162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Craig Mautner
ebb5fbf681 am 379135d3: am dc0afc91: Merge "Fix a bug: unable to start activity when AM is killing the process." 
* commit '379135d3d0f5cd5ca021c2d456370435362b3387':
  Fix a bug: unable to start activity when AM is killing the process.
 2014-08-12 17:10:47 +00:00
Craig Mautner
379135d3d0 am dc0afc91: Merge "Fix a bug: unable to start activity when AM is killing the process." 
* commit 'dc0afc91c24c217705d6d430aa7fabbd22b6d2b3':
  Fix a bug: unable to start activity when AM is killing the process.
 2014-08-12 17:05:11 +00:00
Baligh Uddin
19260bbef2 am 20cdca1a: (-s ours) am 348e04b1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '20cdca1ad64f382dd95d4ecc89d9f32559ed916c':
  Import translations. DO NOT MERGE
 2014-08-12 17:03:38 +00:00
Baligh Uddin
4c0660fac2 am 08fdf0df: (-s ours) am af5fc7fc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '08fdf0dfa89031876fb83cffbaaf53aeec57b13e':
  Import translations. DO NOT MERGE
 2014-08-12 17:03:34 +00:00
Baligh Uddin
1caefe8923 am 169a3cea: (-s ours) am 493285fd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '169a3ceadfa32b2933e874dbab60726430ba6325':
  Import translations. DO NOT MERGE
 2014-08-12 17:03:29 +00:00
Baligh Uddin
577db65767 am 7f82d8b7: (-s ours) am 55f3bb6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '7f82d8b7b372c8f8f85c1090e610a5dd26ff8f6b':
  Import translations. DO NOT MERGE
 2014-08-12 17:03:25 +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
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
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
14690b0aa3 Merge "Improve error reporting when renaming fonts." into lmp-dev 2014-08-12 16:54:46 +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
45d48d4dbb am bd6870da: am caffb908: Merge "Fix registering global priority sessions" into lmp-dev 
* commit 'bd6870dad4e4f14817c13e1daa2d88aebf456225':
  Fix registering global priority sessions
 2014-08-12 16:46:52 +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
6be8fe3070 am d931a7c8: am 18cfb2a8: Merge "Fixed a bug where a notification had no background" into lmp-dev 
* commit 'd931a7c874847091833ed274245d2ec22f51d007':
  Fixed a bug where a notification had no background
 2014-08-12 16:08:17 +00:00
Robin Lee
1aec14ec39 am a4ca4bc5: am 40bdb1f7: Clean up DevicePolicyManager CA certificate APIs 
* commit 'a4ca4bc5a6763d4267c94a2701e1eb7073c886ea':
  Clean up DevicePolicyManager CA certificate APIs
 2014-08-12 16:08:08 +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
b0ce72900e am 76369ebe: am 0fb5d38b: Merge "Pass elevation to enable shadow in shared elements." into lmp-dev 
* commit '76369ebe27f4b2f6365d5ee4431c6116e159f028':
  Pass elevation to enable shadow in shared elements.
 2014-08-12 14:44:00 +00: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
564330f51e am 11e2e54a: am de4084d3: Add equals method of TvContentRating 
* commit '11e2e54ae09219976fb6a3622536a753d2655172':
  Add equals method of TvContentRating
 2014-08-12 14:31:00 +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
99ac575fb0 am d44be506: am 1de7bb2d: Merge "Treat empty subrating as the same as null subratings." into lmp-dev 
* commit 'd44be506563477946a2be471338064a3220222d6':
  Treat empty subrating as the same as null subratings.
 2014-08-12 13:37:45 +00: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
8f2c3f2acb am 8f9f53d1: am a1424732: Merge "Add version attribute in tv_content_rating_system.xml" into lmp-dev 
* commit '8f9f53d12ed054527157719d0f167123dc07f103':
  Add version attribute in tv_content_rating_system.xml
 2014-08-12 13:10:27 +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
7f83b2e10c am ca50b6c0: am df178596: Merge "Fixed a ordering bug with the notification shade" into lmp-dev 
* commit 'ca50b6c095f3d1427517376107ae683bd12e5d71':
  Fixed a ordering bug with the notification shade
 2014-08-12 12:51:30 +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
397eb6b4ca am ffa5d847: am c294cdf1: Fixed a jump in the stack scroller algorithm 
* commit 'ffa5d8472755ffcd8bebb9c116c2c4bc511187c0':
  Fixed a jump in the stack scroller algorithm
 2014-08-12 12:15:26 +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
33b465ef40 am fd3ccce0: am 2f980820: Merge "Use the system property for the HdmiControlService configuration." into lmp-dev 
* commit 'fd3ccce0ed6091791c26f7399906fc0b813e86c3':
  Use the system property for the HdmiControlService configuration.
 2014-08-12 08:58:13 +00:00
Wonsik Kim
cd1041e514 am de9bd9d0: am 85e21042: Merge "TIF: small refactoring around audio configuration update" into lmp-dev 
* commit 'de9bd9d00dfa5d2dc86870a0b5c035b528db3ebb':
  TIF: small refactoring around audio configuration update
 2014-08-12 08:58:09 +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
55a2f92655 am 5b5e9018: am daafdbb1: Merge "CEC: Fix two bugs" into lmp-dev 
* commit '5b5e9018be48ccc000ae78c8470f13634d92ae02':
  CEC: Fix two bugs
 2014-08-12 07:15:20 +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
Leo Hsu
5073145f85 Fix a bug: unable to start activity when AM is killing the process. 
Symptom: No activity was started for startActivity, low repro rate.
Root Cause: Starting activity on a process which was killed by ActivityManagerService.killUnneededProcessLocked() and before receiving AppDeathRecipient of it.
Solution: Choose the flow of starting a new process if ProcessRecord.killedByAm is true.

Change-Id: Ida2639b0fb4631222fc92d65aadc9fd2da637b45
 2014-08-12 13:47:23 +08:00
Jungshik Jang
41edd61ca3 am adf502db: am 663006eb: Merge "Set active port path to HdmiControlService" into lmp-dev 
* commit 'adf502db651f0cf3657f65d91f6d6aac0bd4c5d0':
  Set active port path to HdmiControlService
 2014-08-12 05:35:47 +00:00
Amit Mahajan
62cd5d9421 am aa2b612f: am 19341807: Revert "add apn setting parameters, and set apn parameters to bp" 
* commit 'aa2b612f7f3d7a821c0eaf25d501e13695940f4b':
  Revert "add apn setting parameters, and set apn parameters to bp"
 2014-08-12 05:35:41 +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
Jinsuk Kim
b9dc94246c am ff744028: am c7410e7c: Merge "CEC: Make sure CEC switch info is always updated" into lmp-dev 
* commit 'ff744028e9bf717ed7e3aa27d800d76b136e2f19':
  CEC: Make sure CEC switch info is always updated
 2014-08-12 05:28:15 +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