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

150717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jinsuk Kim
22df1c14c3 am c65e637d: am 2e84b632: Merge "CEC: Fix a bug not sending <Set Stream Path>" into lmp-dev 
* commit 'c65e637d0e7a2dd0e2f3e01e3c9471153d36e52b':
  CEC: Fix a bug not sending <Set Stream Path>
 2014-08-21 06:10:20 +00:00
Jinsuk Kim
0beb87811f am 2e84b632: Merge "CEC: Fix a bug not sending <Set Stream Path>" into lmp-dev 
* commit '2e84b6327b87481fbf1b7ad769361c10e50a1028':
  CEC: Fix a bug not sending <Set Stream Path>
 2014-08-21 06:01:48 +00:00
Jinsuk Kim
f860be88a9 Merge "CEC: Fix a bug not sending <Set Stream Path>" into lmp-dev 2014-08-21 05:53:51 +00:00
Jinsuk Kim
4c80b835cd am 6c68b9fd: am b614b10f: Merge "CEC: Invoke input change for RAP request from MHL device" into lmp-dev 
* commit '6c68b9fdcbadf28f260ec73b0b1e39b2ad901efe':
  CEC: Invoke input change for RAP request from MHL device
 2014-08-21 05:42:26 +00:00
Jinsuk Kim
0eeec5a3a7 am b614b10f: Merge "CEC: Invoke input change for RAP request from MHL device" into lmp-dev 
* commit 'b614b10f7c4b2015ba55c5cb601e9067c6b47398':
  CEC: Invoke input change for RAP request from MHL device
 2014-08-21 05:33:02 +00:00
Jinsuk Kim
2626958c4b CEC: Fix a bug not sending <Set Stream Path> 
Passes the right flag to manual routing switching method for TV
to send out <Set Stream Path> to the newly selected device(path).

Bug: 17169555
Change-Id: I4a14925e366a433f36b28170e37d041053c0060d
 2014-08-21 14:31:40 +09:00
Jinsuk Kim
6800cddd6f Merge "CEC: Invoke input change for RAP request from MHL device" into lmp-dev 2014-08-21 05:26:19 +00:00
Junda Liu
97cd3d1cc8 am 0366bcf7: am ace7e722: Merge "Add getCdmaMdn and getCdmaMin as system api to telmgr." into lmp-dev 
* commit '0366bcf70ad2affe1ec7b1c3b01376a2e4078fcd':
  Add getCdmaMdn and getCdmaMin as system api to telmgr.
 2014-08-21 04:58:33 +00:00
Junda Liu
018ddd809b am ace7e722: Merge "Add getCdmaMdn and getCdmaMin as system api to telmgr." into lmp-dev 
* commit 'ace7e722cf0cd1aacf0ee39fe2fbd8fde61ca98e':
  Add getCdmaMdn and getCdmaMin as system api to telmgr.
 2014-08-21 04:49:19 +00:00
Junda Liu
cad78a801d Merge "Add getCdmaMdn and getCdmaMin as system api to telmgr." into lmp-dev 2014-08-21 04:43:39 +00:00
Wei Wang
1aa176d282 am ffa37ce4: am 50a32a5e: Merge "Fix threading issue for advertising." into lmp-dev 
* commit 'ffa37ce48f06e0f94e1e8e801639a5fbc2c563df':
  Fix threading issue for advertising.
 2014-08-21 04:30:52 +00:00
Wei Wang
15507d929e am 50a32a5e: Merge "Fix threading issue for advertising." into lmp-dev 
* commit '50a32a5e1d86cbfca574e73698daf50c2bf81fc4':
  Fix threading issue for advertising.
 2014-08-21 04:20:33 +00:00
Jae Seo
8e1b570e3b am 797eeba5: am 9c179483: API Review: android.media.tv 
* commit '797eeba5445672125bf49e92812a910231163b00':
  API Review: android.media.tv
 2014-08-21 04:19:44 +00:00
Wei Wang
7cb10ac392 Merge "Fix threading issue for advertising." into lmp-dev 2014-08-21 04:10:51 +00:00
Jae Seo
841d3245ab am 9c179483: API Review: android.media.tv 
* commit '9c179483cb20f1933563a73dee85106694a06d1b':
  API Review: android.media.tv
 2014-08-21 04:10:09 +00:00
Jae Seo
14355950d5 API Review: android.media.tv 
TvContentRating:
- The XML file: attributes should have android: prefix and should allow
  string resource references for labels.

Bug: 17114406
Change-Id: Ife2f4dc6c2c8a5a1714cdeedb27aab40fce73e2b
 2014-08-20 20:59:51 -07:00
Jinsuk Kim
e9f6ed3b11 CEC: Invoke input change for RAP request from MHL device 
Transform RAP[ContentOn/Off] to input change event.

Bug: 17141884
Change-Id: Ic2d8e305f482ebb4f4f3b3e167f726a66dc174cf
 2014-08-21 12:54:18 +09:00
Svet Ganov
2afdba5c5b am 51cb9701: am 2b86b50b: Merge "Notify app widget hosts when cross-profile providers change." into lmp-dev 
* commit '51cb97015fd3316a371b0e16649f5c757ffb8ae1':
  Notify app widget hosts when cross-profile providers change.
 2014-08-21 03:10:09 +00:00
Svetoslav
96ebc6eab8 am 5af18576: am 0ab2d34b: Merge "Using default system icon for print spooler" into lmp-dev 
* commit '5af185769f15968754030c8be45c38760af59954':
  Using default system icon for print spooler
 2014-08-21 03:10:04 +00:00
Svetoslav
03328a641f am ae0bb518: am d5f8a500: Merge "Update the "More options" button in printing." into lmp-dev 
* commit 'ae0bb518bf28f4d5869baabd43eac1e9ba7fb376':
  Update the "More options" button in printing.
 2014-08-21 03:09:58 +00:00
Wei Wang
b7bfaa0e0c am 5410bad8: am b6f53353: Merge "Fix race condition for BluetoothLeScanner." into lmp-dev 
* commit '5410bad866bdb69aaea30f850839aba040cebb50':
  Fix race condition for BluetoothLeScanner.
 2014-08-21 03:09:54 +00:00
Christopher Tate
381b43c3d1 am e7a39e14: am 54eaf4f8: Merge "Maintain transport connection through package updates" into lmp-dev 
* commit 'e7a39e146667ffc0def1fe712476a07c1bfca325':
  Maintain transport connection through package updates
 2014-08-21 03:08:59 +00:00
Adam Powell
b9af1b1d47 am 87eb0faa: am 74f2ad5d: Merge "Fix measurement regression in ActionBarContainer" into lmp-dev 
* commit '87eb0faaf3829f212503e87f88c313e4ce9f1b94':
  Fix measurement regression in ActionBarContainer
 2014-08-21 03:08:49 +00:00
Robert Greenwalt
6ac13f3886 am 61e2c4d4: am 251ccb52: Merge "Add config resource to overlay tcp buffer sizes." into lmp-dev 
* commit '61e2c4d4ba62ef5b338d6819d471d90ffb35068c':
  Add config resource to overlay tcp buffer sizes.
 2014-08-21 03:08:10 +00:00
Robert Greenwalt
3cbbb788f2 am 32880cb0: am 3a494857: Merge "Avoid reusing a currently active NetID." into lmp-dev 
* commit '32880cb05dddacb1a70bd27fe3cf187ac23cf008':
  Avoid reusing a currently active NetID.
 2014-08-21 03:08:05 +00:00
Robert Greenwalt
d104d72e53 am 9be0b06c: am c0674366: Merge "Fix listening NetworkRequests to listen for all networks." into lmp-dev 
* commit '9be0b06c37952a6bcf6e5b21976d6a3317991510':
  Fix listening NetworkRequests to listen for all networks.
 2014-08-21 03:08:00 +00:00
Robert Greenwalt
535aa1ef91 am 5133fa4f: am 7f07196d: Merge "Add missing break statements to avoid unnecessary network validation." into lmp-dev 
* commit '5133fa4f1736aab1d807a6549973489e97fab827':
  Add missing break statements to avoid unnecessary network validation.
 2014-08-21 03:07:55 +00:00
Robert Greenwalt
16cae8d5c9 am 95c1fe99: am dd387b4a: Merge "Fix CS/NetworkMonitor race." into lmp-dev 
* commit '95c1fe99585077c20d1287bc6e4e74a58bdaa63c':
  Fix CS/NetworkMonitor race.
 2014-08-21 03:07:51 +00:00
Jason Monk
76d50fc5d6 am e6ecfca2: am 45959a5e: Merge "Fix SOCKS proxies from being dropped from PAC" into lmp-dev 
* commit 'e6ecfca245c8a5859f4566e42732d41579cff118':
  Fix SOCKS proxies from being dropped from PAC
 2014-08-21 03:07:45 +00:00
Guang Zhu
dba20e6b0d am 5e6dc637: am 6c2d3ce6: Merge "follow up minor fixes for connectivity manager test" into lmp-dev 
* commit '5e6dc63748b9c0ebf5dc4be832580d8e8cf9bf1f':
  follow up minor fixes for connectivity manager test
 2014-08-21 03:06:40 +00:00
Adam Powell
6c6f99dc20 am 3f0554bf: am c33bc746: Merge "Unify code paths for collapsing action views in action bars" into lmp-dev 
* commit '3f0554bfbe12e96545adc227f22739c48eb8b93e':
  Unify code paths for collapsing action views in action bars
 2014-08-21 03:06:34 +00:00
Guang Zhu
24d0d13471 am 64f9b348: am e046262d: Merge "fixes for connectivity manager test suite" into lmp-dev 
* commit '64f9b348d3e555aafb0b68794e37e303b7ecb898':
  fixes for connectivity manager test suite
 2014-08-21 03:03:27 +00:00
Amit Mahajan
5b8a3e8fe8 am 91c35e8d: am 5b821459: Merge "Adding APIs to get IMEI/MEID" into lmp-dev 
* commit '91c35e8d297050b7c902a3ab5eeadb29997fbf07':
  Adding APIs to get IMEI/MEID
 2014-08-21 03:03:22 +00:00
Chris Craik
16b77f116f am 08ae94e2: am d093d695: Merge "Add bounds checking to nine patch scaling" into lmp-dev 
* commit '08ae94e2d2f4643c40f7be24e72202132fb99e9e':
  Add bounds checking to nine patch scaling
 2014-08-21 03:03:17 +00:00
Lorenzo Colitti
9693de21f4 am 2e9ab3ab: am aebd7b79: Merge "Update state to failed if the VPN fails to connect." into lmp-dev 
* commit '2e9ab3abfd1fe84a3021d549cdd43c45c8bfda73':
  Update state to failed if the VPN fails to connect.
 2014-08-21 03:02:37 +00:00
Yorke Lee
8c7dfb3a3b am fa0efcd1: am 0719e606: Merge "Make AudioState modes static constants" into lmp-dev 
* commit 'fa0efcd1e746bfcdc7172d7547a53c9cf1531fb7':
  Make AudioState modes static constants
 2014-08-21 03:02:22 +00:00
Jeff Davidson
814c033d38 am d217efb9: am 709941fd: Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-dev 
* commit 'd217efb9da55bbdbb69bd33cb88531cb7c1ce76b':
  Less intrusive VPN dialog and other UX tweaks.
 2014-08-21 03:01:44 +00:00
Diego Pontoriero
2d21ec47ca am 744a16e4: am dede6854: Merge "Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC." into lmp-dev 
* commit '744a16e448533d591205fb24c46ee218e08d4e4e':
  Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC.
 2014-08-21 03:01:39 +00:00
Amith Yamasani
58201d9a8b am 614e4635: am d5d82cf3: Merge "Add a hidden method to query profile owner name for a user" into lmp-dev 
* commit '614e4635ee6f6316736384cf174dd6ca4f18c6b6':
  Add a hidden method to query profile owner name for a user
 2014-08-21 03:00:21 +00:00
Jorim Jaggi
adc397ae79 am 13a776ac: am 61dfef79: Merge "Accessibility actions for lock/phone/camera icon" into lmp-dev 
* commit '13a776ac900c690accda6f02392512f03bc1969e':
  Accessibility actions for lock/phone/camera icon
 2014-08-21 03:00:16 +00:00
John Reck
e4ed4f74d1 am 17ed6e74: am 876f1a1a: Merge "Implement full View.buildLayer" into lmp-dev 
* commit '17ed6e74ce560916d4a06198d4f6446562d9db34':
  Implement full View.buildLayer
 2014-08-21 03:00:11 +00:00
Alan Viverette
efc725aa10 am 3c7d85df: am a4fb61a6: Merge "Forward additional drawable methods in AVD" into lmp-dev 
* commit '3c7d85df63398654e6c221fd7bab8312ffbe3459':
  Forward additional drawable methods in AVD
 2014-08-21 03:00:07 +00:00
Jason Monk
e1fd447596 am fb0f3ab2: am a765518f: Merge "Lock task doesn\'t always end properly." into lmp-dev 
* commit 'fb0f3ab21eed9a93f6792f0c610d96cb8caaebf6':
  Lock task doesn't always end properly.
 2014-08-21 02:57:42 +00:00
Sailesh Nepal
9b78e2c092 am 2c4ffbf9: am 9c59bd75: Merge "Clean up and fix bugs in ConnectionService.createConnection" into lmp-dev 
* commit '2c4ffbf9dc5666b36d8b56901f47fa39da33cd5e':
  Clean up and fix bugs in ConnectionService.createConnection
 2014-08-21 02:57:36 +00:00
Tenghui Zhu
e4dc2c0ad9 am 4f39448e: am 36f1b53f: Merge "Revert "Revert "Update indeterminate linear progress bar""" into lmp-dev 
* commit '4f39448eb5fa1c62d1c7ce71f3205dcce73bb694':
  Revert "Revert "Update indeterminate linear progress bar""
 2014-08-21 02:57:30 +00:00
Jeff Brown
103ceaec67 am f6d0c657: am ddc35381: Reset auto-brightness setting to default. 
* commit 'f6d0c6570076fd63d4b6d9ba61d2cea86f38d93e':
  Reset auto-brightness setting to default.
 2014-08-21 02:57:25 +00:00
Jeff Brown
070371bbf7 am 6562f2ce: am 2bc60f6e: Only select bluetooth route by default when A2DP is enabled. 
* commit '6562f2ce10715a18112be6158e8fa76b82b70b87':
  Only select bluetooth route by default when A2DP is enabled.
 2014-08-21 02:57:21 +00:00
Michael Wright
fbf5472ecd am 56ba049e: am f2516f7c: Add cleanspec for inputflinger removal 
* commit '56ba049ed08e4ad7632e10df2b0d5415b00295a0':
  Add cleanspec for inputflinger removal
 2014-08-21 02:54:20 +00:00
Jeff Davidson
2cfe5359eb am 5e3130d6: am fa141926: Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev 
* commit '5e3130d63a745ad6cd3ccf535845128ae744d092':
  Improve documentation of ScanResult and WifiInfo.
 2014-08-21 02:47:05 +00:00
Svet Ganov
38676f370e am 2b86b50b: Merge "Notify app widget hosts when cross-profile providers change." into lmp-dev 
* commit '2b86b50b0f79b24cc2e738469dbfc2e0dc110cdb':
  Notify app widget hosts when cross-profile providers change.
 2014-08-21 02:02:56 +00:00