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

173700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jinsuk Kim
5b972d58cb am 0cbbfb2b: am 7640d989: CEC: Fix a regression bug 
* commit '0cbbfb2beab0cf63521e59904db31661a4832531':
  CEC: Fix a regression bug
 2015-01-29 06:55:26 +00:00
Jinsuk Kim
c8ece533b2 am 5e34b6b9: am 43b2746b: Merge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev 
* commit '5e34b6b9af93a50354a31f900455ec24e79c2528':
  CEC: Let <Active Source> from the active source work
 2015-01-29 06:55:19 +00:00
Jinsuk Kim
0cbbfb2bea am 7640d989: CEC: Fix a regression bug 
* commit '7640d9895cf8fae7a99a7db5bba0079ba6022621':
  CEC: Fix a regression bug
 2015-01-29 06:46:43 +00:00
Jinsuk Kim
5e34b6b9af am 43b2746b: Merge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev 
* commit '43b2746bcdfb49aed255ac0f6dd6fb95909dcfc1':
  CEC: Let <Active Source> from the active source work
 2015-01-29 06:46:39 +00:00
Jinsuk Kim
7640d9895c CEC: Fix a regression bug 
The HdmiControlService.getActiveSource() has a regression (exception)
when calling getDeviceInfoByPath since method should be called on
a service thread. Introduced a method that can be invoked safely
from the main thread.

Bug: 19170884
Change-Id: I393161e08c916270faf46147a97076bc573b808f
 2015-01-29 06:41:49 +00:00
Jinsuk Kim
43b2746bcd Merge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev 2015-01-29 06:40:47 +00:00
vandwalle
7e553a06a0 Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev automerge: d169839 
automerge: 0a22d43

* commit '0a22d43c9143475c889ce54f0de6261e8857ab9d':
  aggressively blacklist WifiConfiguration for the purpose of switching network
 2015-01-29 05:00:44 +00:00
vandwalle
0a22d43c91 Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev 
automerge: d169839

* commit 'd1698393e71f4792f98156bb963e5876bc8c2eb0':
  aggressively blacklist WifiConfiguration for the purpose of switching network
 2015-01-29 04:57:00 +00:00
vandwalle
d1698393e7 Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev 2015-01-29 04:50:44 +00:00
Stuart Scott
cf8ae79ef2 am 8d702000: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev automerge: f4e5236 
* commit '8d702000a7291068e639a9954e03c36d66144449':
  Change getDeviceId to take phoneId.
 2015-01-29 02:06:51 +00:00
Stuart Scott
8d702000a7 Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev 
automerge: f4e5236

* commit 'f4e52360613d20dc8176ce8a37cb05ad904fad0d':
  Change getDeviceId to take phoneId.
 2015-01-29 01:58:53 +00:00
Stuart Scott
f4e5236061 Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev 2015-01-29 01:55:47 +00:00
Dirk Dougherty
1cbe026b93 am 820d5c52: am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language. automerge: 3f9d57d automerge: e0b5a38 
* commit '820d5c52b7e65bffeb4291887f5a1011e7ce971e':
  Doc change: Update Ads terms language.
 2015-01-29 01:11:14 +00:00
Dirk Dougherty
820d5c52b7 am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language. automerge: 3f9d57d 
automerge: e0b5a38

* commit 'e0b5a3812269228070dabb792bc501ae435338bb':
  Doc change: Update Ads terms language.
 2015-01-29 01:01:32 +00:00
Dirk Dougherty
e0b5a38122 am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language. 
automerge: 3f9d57d

* commit '3f9d57dbe896d56e0eae381aa3e70ac93d755f24':
  Doc change: Update Ads terms language.
 2015-01-29 00:54:45 +00:00
Jae Seo
49801634e4 am 4b1e5814: am 71191442: TIF: Do not call session callbacks when the session is already released 
* commit '4b1e5814d18dae8f2581cf702da4b4e1de0c3eb4':
  TIF: Do not call session callbacks when the session is already released
 2015-01-29 00:46:25 +00:00
Jae Seo
4b1e5814d1 am 71191442: TIF: Do not call session callbacks when the session is already released 
* commit '711914421896ad15ab3c944c3adc838ac67cf2a6':
  TIF: Do not call session callbacks when the session is already released
 2015-01-29 00:33:29 +00:00
Dirk Dougherty
3f9d57dbe8 am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language. 
* commit '8b1ad8e4d148b70e31d675515e8ad24ca3d12169':
  Doc change: Update Ads terms language.
 2015-01-29 00:30:37 +00:00
Dirk Dougherty
8b1ad8e4d1 am 49738792: Doc change: Update Ads terms language. 
* commit '497387928d53cca060c3f43b3a9f5c7834564333':
  Doc change: Update Ads terms language.
 2015-01-29 00:24:39 +00:00
Dirk Dougherty
497387928d Doc change: Update Ads terms language. 
Change-Id: I57cf037229f966f52c20c05f6ac29cc6774b1643
 2015-01-29 00:16:25 +00:00
Jae Seo
7119144218 TIF: Do not call session callbacks when the session is already released 
Bug: 19146382
Change-Id: I5592d4bf033478e5e5e1013bd2ad5ea572df44dd
 2015-01-28 15:50:08 -08:00
Eino-Ville Talvala
745d45e0c0 am 06b1014c: Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev automerge: a17ab21 
* commit '06b1014cf28431706d42219549170896bd581a29':
  Camera2 legacy: Do not advertise NV21 support.
 2015-01-28 23:29:23 +00:00
Eino-Ville Talvala
06b1014cf2 Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev 
automerge: a17ab21

* commit 'a17ab21d4c81ecc80b00b14fe56ce721b4e757ae':
  Camera2 legacy: Do not advertise NV21 support.
 2015-01-28 23:22:56 +00:00
Eino-Ville Talvala
a17ab21d4c Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev 2015-01-28 23:20:01 +00:00
xinhe
5e51c21943 am 93487e28: Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev automerge: fc921d1 
* commit '93487e286e6bfa434fb092c6276d96b40e5d62c4':
  Sprint: MMS cannot be sent in the UK
 2015-01-28 21:53:34 +00:00
xinhe
93487e286e Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev 
automerge: fc921d1

* commit 'fc921d19b6d6d26f3b0147ba9c1ee96298e6a17c':
  Sprint: MMS cannot be sent in the UK
 2015-01-28 21:45:25 +00:00
xinhe
fc921d19b6 Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev 2015-01-28 21:42:15 +00:00
Jose Lima
485f6a60e0 am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge: 1f81973 
* commit '4a40f7cc90d8f908527d2cfff32376ee51259250':
  Fix crash caused by disabling the Options panel on TVs
 2015-01-28 21:27:33 +00:00
Leon Scroggins III
1334d5cfb4 am c7109115: am cefcd81b: am 3c9376a5: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5 automerge: 5d7bd13 automerge: 4c6ace6 
* commit 'c71091151636f8276c4d1bffc75b66f90a36c774':
 2015-01-28 21:27:15 +00:00
Stuart Scott
d456ec4be1 Change getDeviceId to take phoneId. 
bug:18827144
Change-Id: I32196f842504e63f4ddd45401e83e73afae81ad5
 2015-01-28 13:06:12 -08:00
Jose Lima
4a40f7cc90 Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev 
automerge: 1f81973

* commit '1f81973e7d33f2a3f4b0a0e232854283f0f18030':
  Fix crash caused by disabling the Options panel on TVs
 2015-01-28 20:59:05 +00:00
Eino-Ville Talvala
ccf6e88eec Camera2 legacy: Do not advertise NV21 support. 
Also reduce logging somewhat for common scenarios.

Bug: 19161738
Change-Id: If96ed7d2bac0229159564072d7969d7bea3fae27
 2015-01-28 12:57:56 -08:00
Jose Lima
1f81973e7d Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev 2015-01-28 20:55:52 +00:00
Leon Scroggins III
c710911516 am cefcd81b: am 3c9376a5: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5 automerge: 5d7bd13 automerge: 4c6ace6 
* commit 'cefcd81bdb47ca3196fe487e684880d70ff8073c':
 2015-01-28 19:13:55 +00:00
Leon Scroggins III
cefcd81bdb am 3c9376a5: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5 automerge: 5d7bd13 
automerge: 4c6ace6

* commit '4c6ace6fd683133a2d36e4bf9cb48491055e8d5e':
 2015-01-28 19:09:08 +00:00
Jose Lima
bd769a15ab Fix crash caused by disabling the Options panel on TVs 
Address more cases where calls to getPanelState may cause a crash when the
options panel is disabled on a platform.

Bug: 19178531
Bug: 18780696
Change-Id: Ib72bb8483e636181788ed3919c4cb9e99a94b7b1
 2015-01-28 10:46:39 -08:00
xinhe
6620b4273e Sprint: MMS cannot be sent in the UK 
This is due to Sprint network at UK is actually GSM/UMTS. Thus we need GSM phone with CSIM to provide Nai too.

Bug:18241756
Change-Id: Icec10c88834151f5e35e38db93af36d7f40890fd
 2015-01-28 10:40:27 -08:00
Leon Scroggins III
4c6ace6fd6 am 3c9376a5: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5 automerge: 5d7bd13 
* commit '3c9376a5a2cbcad5c6883dad1e938a7924a8dd4d':
 2015-01-28 18:32:20 +00:00
Leon Scroggins III
3c9376a5a2 am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5 
automerge: 5d7bd13

* commit '5d7bd13fc88d066d4c27a2459f3e3a58a1f4dec2':
 2015-01-28 18:23:47 +00:00
Bryce Lee
263987f626 am 2a8ccd4b: am 1061652a: Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev 
* commit '2a8ccd4b1f82086f6e38ec32ad084306400dcf93':
  Revert "Make THEATER_MODE_ON setting a system api."
 2015-01-28 17:58:41 +00:00
John Spurlock
7fb346ec20 am 4b41400b: am e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev 
* commit '4b41400b60d57f23b16702540b9d50f98aeeffb7':
  Default "pickup peforms proximity check" to false.
 2015-01-28 17:58:35 +00:00
Bryce Lee
2a8ccd4b1f am 1061652a: Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev 
* commit '1061652a37e18683c994f9d4b872ecf990125a05':
  Revert "Make THEATER_MODE_ON setting a system api."
 2015-01-28 17:52:59 +00:00
John Spurlock
4b41400b60 am e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev 
* commit 'e2f4ab930fa4526cf989624356051b99008c23a6':
  Default "pickup peforms proximity check" to false.
 2015-01-28 17:52:48 +00:00
Bryce Lee
1061652a37 Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev 2015-01-28 17:50:39 +00:00
John Spurlock
e2f4ab930f Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev 2015-01-28 17:48:13 +00:00
Bryce Lee
034dc3839f Revert "Make THEATER_MODE_ON setting a system api." 
This reverts commit 35dafda1b0357eb0f2eef766427a2b473967a918.

Change-Id: I76e72592791682e0dbee719fbd518962a1bdcd11
 2015-01-28 17:45:35 +00:00
Leon Scroggins III
5d7bd13fc8 am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
automerge: 1e0d4b5

* commit '1e0d4b5611f9a7134c9ab5fdb62b9385c5161c7c':
  Handle bad ninepatch data.
 2015-01-28 17:39:52 +00:00
Bryce Lee
f2d5253bce am fdb8dff5: am d8cb4040: Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev 
* commit 'fdb8dff54cf9327089e5ee4d5bf461ef42020fcd':
  Make THEATER_MODE_ON setting a system api.
 2015-01-28 17:15:11 +00:00
Bryce Lee
fdb8dff54c am d8cb4040: Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev 
* commit 'd8cb404035e8e133e310f5d811d44e3b0ecb8dcf':
  Make THEATER_MODE_ON setting a system api.
 2015-01-28 17:09:21 +00:00
Bryce Lee
d8cb404035 Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev 2015-01-28 17:03:57 +00:00