OSDN Git Service

android-x86/frameworks-base.git
9 years agoImplement 'Available via Passpoint' feature
Vinit Deshpande [Fri, 3 Apr 2015 23:43:41 +0000 (16:43 -0700)]
Implement 'Available via Passpoint' feature

This also fixes the issues related to explicit connection
to passpoint AP, and fixes occassional mention of
'connected via Wi-Fi Assistent'

Change-Id: Ib4de956f2ea29709d0212fbcb392815644800e78

9 years agoDeprecate EXTRA_PROXY_INFO and unhide ConnectivityManager.getDefaultProxy().
Paul Jensen [Wed, 11 Mar 2015 15:51:46 +0000 (11:51 -0400)]
Deprecate EXTRA_PROXY_INFO and unhide ConnectivityManager.getDefaultProxy().

1. Unhide ConnectivityManager.getDefaultProxy() and update it to
   take into account process-bound-Networks.
2. Deprecate EXTRA_PROXY_INFO and instead encourage querying via
   getDefaultProxy().

Bug: 17905627
Bug: 17420465
Bug: 18144582

Change-Id: I45358ee82fe705d048022c8238b2452f52c37b88

9 years agoMerge "IMS-VT: Upgrade/Downgrade change -Add isVideo API to VideoProfile.VideoState...
Tyler Gunn [Fri, 3 Apr 2015 01:51:44 +0000 (01:51 +0000)]
Merge "IMS-VT: Upgrade/Downgrade change -Add isVideo API to VideoProfile.VideoState" into m-wireless-dev

9 years agoDeprecate static ConnectivityManager.get/setProcessDefaultNetwork() functions.
Paul Jensen [Tue, 10 Mar 2015 14:54:12 +0000 (10:54 -0400)]
Deprecate static ConnectivityManager.get/setProcessDefaultNetwork() functions.

These functions risk hitting an unchecked Exception due to ConnectivityManager
not being instantiated yet.  Also, change Network.openConnection() to throw a
checked Exception rather than an unchecked Exception when ConnectivityManager
is not yet instantiated.

bug:19416463
Change-Id: Ie1e2b3238aec0343d267c76b64927073f2f05f85

9 years agoIMS-VT: Upgrade/Downgrade change
Rekha Kumar [Tue, 24 Mar 2015 23:42:31 +0000 (16:42 -0700)]
IMS-VT: Upgrade/Downgrade change
-Add isVideo API to VideoProfile.VideoState

IMS-VT: Fix propagation of device orientation.
Orientation received at VT Service is incorrect.
Fixed propagation of device orientation to VT service.

IMS-VT: Upgrade fix
-Add session modify call timed out constant

Notify listeners of video quality changed event
- Propagate the video quality changed message to the UI.

IMS: Add support for video quality
- Add Config interface to get/set video quality

IMS-VT: Multitasking feature
-Support for video multitasking

IMS-VT: Modification of data usage aidl
Change data usage aidl interface to take parameter type long
instead of int

Change-Id: I7cda2a689edb86d025dfe8efc8f573918c4bd6bc

Propagate the call substate changed message to the UI

IMS-VT: Add call modifiable capability

PhoneCapababilities call type modifiable constant added

IMS-VT: Add a bit mask CALL_SUBSTATE_ALL with all call substate bits set

IMS-VT: Enable Video conferencing.

Enable Video conferencing.

Change-Id: I4240aa6f32c75d6eea8a41da3c87bca651f0901b

IMS-VT: Add hide for setVideoProvider API
Observed compilation error for SDK generation due to setVideoProvider
API. Marking setVideoProvider as hide inorder to resolve the
compilation error.

IMS-VT: Add persist.radio.ims.audio.output for VT calls
-- Add persist.radio.ims.audio.output to set the default speaker
   for VT calls.
-- Add required constants

IMS-VT: Add additional error codes for upgrade downgrade
-Add support to send additional error codes to UI during
 upgrade downgrade.

Change-Id: Id452d225098fe3bccdcd37d242985c5c761144c1

9 years agoMerge "Deal with null characters in string options." into m-wireless-dev
Lorenzo Colitti [Wed, 1 Apr 2015 08:41:44 +0000 (08:41 +0000)]
Merge "Deal with null characters in string options." into m-wireless-dev

9 years agoAdd DhcpStateMachine PollingState.
Erik Kline [Mon, 23 Feb 2015 08:02:45 +0000 (17:02 +0900)]
Add DhcpStateMachine PollingState.

This state leaves dhcpcd running and polls for results, with
exponential backoff to once every 32 seconds.

Bug: 19422416
Change-Id: I87f481969629ba104491f25ea36de1efc4ad105a

9 years agoDeal with null characters in string options.
Lorenzo Colitti [Tue, 31 Mar 2015 07:26:57 +0000 (16:26 +0900)]
Deal with null characters in string options.

This currently truncates all strings at the first NULL character,
except for vendorInfo, which is an opaque string.

Bug: 19985674
Change-Id: Ie53b2c55eb8a5204d7b2c7e2d8587743d923647a

9 years agoMerge "DO NOT MERGE Do not hide any call log entries when they are added." into m...
Santos Cordon [Wed, 1 Apr 2015 00:04:16 +0000 (00:04 +0000)]
Merge "DO NOT MERGE Do not hide any call log entries when they are added." into m-wireless-dev

9 years agoDO NOT MERGE Do not hide any call log entries when they are added.
Santos Cordon [Thu, 12 Mar 2015 18:51:42 +0000 (11:51 -0700)]
DO NOT MERGE Do not hide any call log entries when they are added.

When a call log entry is added, and it's phone account does not match a
currently registered one, we set it to hidden.  This code was built for
the calllog restore case where call log entries would be hidden when
added if the original phone account wasn't also
present on the new device (where the restore is being performed).

We no longer do that so we're removing the code that sets any call log
entry to hidden.

-- Resubmitting since this change was lost to a merge conflict --

Change-Id: I1ef094d5a35063e8f89cd1ecb1e5a0b59361781c

9 years agoMerge "Remove scanResultCache from WifiConfiguration" into m-wireless-dev
Vinit Deshpande [Tue, 31 Mar 2015 23:00:39 +0000 (23:00 +0000)]
Merge "Remove scanResultCache from WifiConfiguration" into m-wireless-dev

9 years agoRemove scanResultCache from WifiConfiguration
Vinit Deshpande [Fri, 27 Mar 2015 18:40:17 +0000 (11:40 -0700)]
Remove scanResultCache from WifiConfiguration

This is in preparation to use ScanDetail - which is a superset
of ScanResult - in wifi stack. There are no external users of
scanResultCache; so it can be safely removed.

Also fixed a javadoc comment for getPlmn()

Change-Id: I7c49532664ffe2e3e5e134bfcd42615d5999d02f

9 years agoMerge "Don't log errors if the receive thread is stopped." into m-wireless-dev
Vinit Deshpande [Tue, 31 Mar 2015 21:02:01 +0000 (21:02 +0000)]
Merge "Don't log errors if the receive thread is stopped." into m-wireless-dev

9 years agoDon't log errors if the receive thread is stopped.
Lorenzo Colitti [Mon, 30 Mar 2015 22:04:42 +0000 (07:04 +0900)]
Don't log errors if the receive thread is stopped.

Change-Id: I75ddc9b68f0a61a9a7a78026ed97a8a7c5109cc3

9 years agoMerge "WiFi Calling: Show different operator name string in Data usage dialog." into...
Pavel Zhamaitsiak [Mon, 30 Mar 2015 16:21:17 +0000 (16:21 +0000)]
Merge "WiFi Calling: Show different operator name string in Data usage dialog." into lmp-mr1-wfc-dev
automerge: 5fd843b

* commit '5fd843b33383266cfe5f79f7ba4c5134c104cda0':
  WiFi Calling: Show different operator name string in Data usage dialog.

9 years agoam 4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough...
Bart Sears [Mon, 30 Mar 2015 16:20:48 +0000 (16:20 +0000)]
am 4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
automerge: e6687a7

* commit 'e6687a756cf4f6def71d920f80bb5898c081c4e1':
  CEC: Explicitly turn on screen for remote control passthrough

9 years agoMerge "WiFi Calling: Show different operator name string in Data usage dialog." into...
Pavel Zhamaitsiak [Fri, 27 Mar 2015 22:14:29 +0000 (22:14 +0000)]
Merge "WiFi Calling: Show different operator name string in Data usage dialog." into lmp-mr1-wfc-dev

9 years agoam 4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough...
Bart Sears [Fri, 27 Mar 2015 21:15:24 +0000 (21:15 +0000)]
am 4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev

* commit '4a26c391d08dfa6a3c189293f0fc163b817b1b49':
  CEC: Explicitly turn on screen for remote control passthrough

9 years agoAdd API for BLE_SCAN_ALWAYS_AVAILABLE feature.
Wei Wang [Thu, 19 Mar 2015 22:09:56 +0000 (15:09 -0700)]
Add API for BLE_SCAN_ALWAYS_AVAILABLE feature.

Change-Id: I83e966d4db076db367ded71bfb50c39e57568156

9 years agoMerge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
Bart Sears [Fri, 27 Mar 2015 20:48:37 +0000 (20:48 +0000)]
Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev

9 years agoWiFi Calling: Show different operator name string in Data usage dialog.
Pavel Zhamaitsiak [Fri, 27 Mar 2015 16:24:47 +0000 (09:24 -0700)]
WiFi Calling: Show different operator name string in Data usage dialog.

Bug: 19950657
Change-Id: I9999d58e78154ed2d6d824973c40011875de15ef

9 years agoam 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6.
Deepanshu Gupta [Fri, 27 Mar 2015 05:25:10 +0000 (05:25 +0000)]
am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6.
automerge: b3fea86

* commit 'b3fea8671843675db3c091bd4c7c2d4fa31f2917':
  Fix tests for Java 6.

9 years agoam dbe0dd16: When scanning unbundled apps, only install the expected APK tree
Christopher Tate [Fri, 27 Mar 2015 05:24:50 +0000 (05:24 +0000)]
am dbe0dd16: When scanning unbundled apps, only install the expected APK tree
automerge: d291cd4

* commit 'd291cd4040dcaa26d0f5cff637b11011d55fe25b':
  When scanning unbundled apps, only install the expected APK tree

9 years agoam 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6.
Deepanshu Gupta [Fri, 27 Mar 2015 02:19:58 +0000 (02:19 +0000)]
am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6.

* commit '4e6ae02a29dd432648a81f3803f3ccf712621d43':
  Fix tests for Java 6.

9 years agoam 17bb697b: am ec8df9af: Fix tests for Java 6.
Deepanshu Gupta [Fri, 27 Mar 2015 01:09:53 +0000 (01:09 +0000)]
am 17bb697b: am ec8df9af: Fix tests for Java 6.

* commit '17bb697b3bce1b23137553829dd62e0e7c16b472':
  Fix tests for Java 6.

9 years agoam ec8df9af: Fix tests for Java 6.
Deepanshu Gupta [Fri, 27 Mar 2015 01:02:58 +0000 (01:02 +0000)]
am ec8df9af: Fix tests for Java 6.

* commit 'ec8df9af2f35eb5be4df01d66b1add4a4e7546c7':
  Fix tests for Java 6.

9 years agoam dbe0dd16: When scanning unbundled apps, only install the expected APK tree
Christopher Tate [Fri, 27 Mar 2015 00:32:25 +0000 (00:32 +0000)]
am dbe0dd16: When scanning unbundled apps, only install the expected APK tree

* commit 'dbe0dd160e93feef1335830a36e86ae83b19b793':
  When scanning unbundled apps, only install the expected APK tree

9 years agoWhen scanning unbundled apps, only install the expected APK tree
Christopher Tate [Thu, 26 Mar 2015 22:38:29 +0000 (15:38 -0700)]
When scanning unbundled apps, only install the expected APK tree

We now make sure, when scanning post-factory app installs, that we do not
accidentally activate a "leaked" or otherwise superfluous APK tree that the
scan algorithm happens to encounter before the one that we expect a priori
based on the persisted package-installation state.  When we find such an
extraneous installation we ignore it in favor of the expected one, similarly
to the policy used when collecting system-bundled packages that have been
updated.

Even if we find an unexpected APK for the package, if the expected one
turns out to be absent we fall back to the existing "we thought this app
was present and now it isn't" logic.

Bug 19602471

Change-Id: I141a93661946176c05d8cf52a123bdf75c8eef74

9 years agoFix tests for Java 6.
Deepanshu Gupta [Thu, 26 Mar 2015 18:08:43 +0000 (11:08 -0700)]
Fix tests for Java 6.

 - Change the guava version used to match the one included in the SDK.
   The test server uses the same. However, the command line build still
   uses the guava present at platform/external/guava, which is compiled
   with Java 7. Thus, running the tests from inside the IDE can be done
   via Java 6.
 - Rebuilt the test app classes with Java 6 compatibility.
 - Change similarity threshold to prevent differences due to some locale
   settings different java versions.

Change-Id: Ic71d43256a8cf6f9df296e63550667a202c7105f

9 years agoam 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA
Michael Runge [Thu, 26 Mar 2015 06:22:03 +0000 (06:22 +0000)]
am 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA
automerge: 26eaaee

* commit '26eaaeed3dcc0e9010057c7a1cbf177c998c368e':
  Increase timeout when uncrypting OTA

9 years agoam 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA
Michael Runge [Thu, 26 Mar 2015 04:16:29 +0000 (04:16 +0000)]
am 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA

* commit '9a91bf1d18d3855b4bdaaa613fa10372da6e530e':
  Increase timeout when uncrypting OTA

9 years agoam 96f47f5b: am b0197033: Increase timeout when uncrypting OTA
Michael Runge [Thu, 26 Mar 2015 04:08:24 +0000 (04:08 +0000)]
am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA

* commit '96f47f5bf3f498a7a85721de2e265d8fa3e9af26':
  Increase timeout when uncrypting OTA

9 years agoam b0197033: Increase timeout when uncrypting OTA
Michael Runge [Thu, 26 Mar 2015 03:57:33 +0000 (03:57 +0000)]
am b0197033: Increase timeout when uncrypting OTA

* commit 'b019703395ae0304ddd10054843c64db87229d23':
  Increase timeout when uncrypting OTA

9 years agoMerge "Stop output of call number to logs" into lmp-mr1-wfc-dev
Etan Cohen [Thu, 26 Mar 2015 03:16:54 +0000 (03:16 +0000)]
Merge "Stop output of call number to logs" into lmp-mr1-wfc-dev
automerge: 817d718

* commit '817d718d33256c15422d889bd93fb5453ad836a1':
  Stop output of call number to logs

9 years agoIncrease timeout when uncrypting OTA
Michael Runge [Wed, 17 Dec 2014 22:14:12 +0000 (14:14 -0800)]
Increase timeout when uncrypting OTA

Larger OTAs (750 MB tested) are taking 3-4 minutes
to write, due to the O_SYNC needed to ensure that
the data is actually committed to disk prior to
reboot.

Bug: 18750317
Change-Id: Idfab3ffd0276df4548f69a09c72ad6f4a344b6e6
(cherry picked from commit 01c06dfb076b71cb72c4bff9175bec9d59d2efde)

9 years agoMerge "Stop output of call number to logs" into lmp-mr1-wfc-dev
Etan Cohen [Thu, 26 Mar 2015 02:58:54 +0000 (02:58 +0000)]
Merge "Stop output of call number to logs" into lmp-mr1-wfc-dev

9 years agoCEC: Explicitly turn on screen for remote control passthrough
Jinsuk Kim [Tue, 24 Mar 2015 07:55:01 +0000 (16:55 +0900)]
CEC: Explicitly turn on screen for remote control passthrough

Ensures that the playback device turns on display output signal
upon receiving CEC command <User Control Pressed>.

Bug: 19518981
Change-Id: I4f898380c9ffc071da2357a51e61309ae5d233f5
(cherry picked from commit 9b8507c52ae845c8eed9fd9952bf66538934b8fd)

9 years agoStop output of call number to logs
Shriram Ganesh [Thu, 26 Mar 2015 01:14:42 +0000 (18:14 -0700)]
Stop output of call number to logs

Bug: 19602904
Change-Id: Ieb6ae8d5ab27571d1f6cf91c530713f22b21b513

9 years agoMerge "IMS: UT ServiceClass" into lmp-mr1-wfc-dev
Pavel Zhamaitsiak [Wed, 25 Mar 2015 23:04:21 +0000 (23:04 +0000)]
Merge "IMS: UT ServiceClass" into lmp-mr1-wfc-dev
automerge: d3b6cbe

* commit 'd3b6cbe172f429038894b1fae09fb72e8a646519':
  IMS: UT ServiceClass

9 years agoMerge "IMS: UT ServiceClass" into lmp-mr1-wfc-dev
Pavel Zhamaitsiak [Wed, 25 Mar 2015 22:52:36 +0000 (22:52 +0000)]
Merge "IMS: UT ServiceClass" into lmp-mr1-wfc-dev

9 years agoMerge "EAP-AKA' : Add support of EAP-AKA' in WiFi Enterprise methods" into m-wireless-dev
Vinit Deshpande [Wed, 25 Mar 2015 22:44:59 +0000 (22:44 +0000)]
Merge "EAP-AKA' : Add support of EAP-AKA' in WiFi Enterprise methods" into m-wireless-dev

9 years agoEAP-AKA' : Add support of EAP-AKA' in WiFi Enterprise methods
Jean-Michel Bachot [Thu, 11 Dec 2014 19:04:20 +0000 (20:04 +0100)]
EAP-AKA' : Add support of EAP-AKA' in WiFi Enterprise methods

EAP-AKA' is a new hidden method

Change-Id: Ic103b25ad58807eebd5e0f8eefe3bfc02397aedc
Signed-off-by: Jean-Michel Bachot <jean-michel.bachot@intel.com>
Signed-off-by: Abdelmajid MLAYEH <abdelmajidx.mlayeh@intel.com>
9 years agoam 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
Amith Yamasani [Wed, 25 Mar 2015 22:31:56 +0000 (22:31 +0000)]
am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
automerge: ce3153d

* commit 'ce3153df56e4ed984b949869dd0ec97793f2c428':
  Fix NPE if FPE service does not exist.

9 years agoam 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
Amith Yamasani [Wed, 25 Mar 2015 22:19:40 +0000 (22:19 +0000)]
am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev

* commit '0afd1905b59446fc471680325bcbea802bb37c5c':
  Fix NPE if FPE service does not exist.

9 years agoMerge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
Amith Yamasani [Wed, 25 Mar 2015 22:12:44 +0000 (22:12 +0000)]
Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev

9 years agoIMS: UT ServiceClass
Omkar Kolangade [Sat, 31 Jan 2015 11:58:15 +0000 (17:28 +0530)]
IMS: UT ServiceClass

When CF and CW MMI request will be triggered,
user preferred serviceclass will be sent to
the lower layers.

Change-Id: I230c59ec1ab0832e24755d5ba497b2b5e0749ec1

9 years agoFix NPE if FPE service does not exist.
Paul Crowley [Wed, 25 Mar 2015 11:43:42 +0000 (11:43 +0000)]
Fix NPE if FPE service does not exist.

Bug: 19846662
Change-Id: I44e014c66a524b282cce0cfc9b7513fc0f553576

9 years agoMerge "add wifi config for power calculation" into m-wireless-dev
Pierre Vandwalle [Wed, 25 Mar 2015 02:43:53 +0000 (02:43 +0000)]
Merge "add wifi config for power calculation" into m-wireless-dev

9 years agoadd wifi config for power calculation
Pierre Vandwalle [Mon, 23 Mar 2015 01:50:40 +0000 (18:50 -0700)]
add wifi config for power calculation

Change-Id: Ic312ffeb299d199547cc75bc6977140f8e6e5f7b

9 years agoam 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations."...
Deepanshu Gupta [Wed, 25 Mar 2015 00:21:27 +0000 (00:21 +0000)]
am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
automerge: 56789fd

* commit '56789fdb1a90075845c96536658ba501415b9633':
  Update JRE for runConfigurations.

9 years agoam dbb38b30: (-s ours) am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO...
Deepanshu Gupta [Wed, 25 Mar 2015 00:21:20 +0000 (00:21 +0000)]
am dbb38b30: (-s ours) am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
automerge: 5906563  -s ours

* commit '590656314faa267aba787102fd7c673e25710039':
  Fix project settings. [DO NOT MERGE]

9 years agoam e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:21:11 +0000 (00:21 +0000)]
am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev
automerge: 92d46e5

* commit '92d46e594b11cd9abec541bfb5c59267b5e9c540':
  Fix RoundRect radius.

9 years agoam 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and...
Deepanshu Gupta [Wed, 25 Mar 2015 00:21:04 +0000 (00:21 +0000)]
am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
automerge: 5f77229

* commit '5f7722991ec80a4f93083cef6525ccc75221a9d0':
  Use right colors for status bar and nav bar.

9 years agoam 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:20:56 +0000 (00:20 +0000)]
am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev
automerge: 43091cb

* commit '43091cbd204c7b563df5d9771e36a429c5e78c5f':
  Better shadows.

9 years agoam 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:20:48 +0000 (00:20 +0000)]
am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev
automerge: 360ac6f

* commit '360ac6f5610598eb6a841f285a3c42dc72198475':
  Fix layoutlib tests.

9 years agoam 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations."...
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:31 +0000 (00:08 +0000)]
am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev

* commit '862f5900e8abce1cc20979a4dca76e1f0b982880':
  Update JRE for runConfigurations.

9 years agoam dbb38b30: (-s ours) am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO...
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:28 +0000 (00:08 +0000)]
am dbb38b30: (-s ours) am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev

* commit 'dbb38b30612dc054ba3bf066f8528cccfceb47ad':
  Fix project settings. [DO NOT MERGE]

9 years agoam e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:23 +0000 (00:08 +0000)]
am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev

* commit 'e97079d97a5c914d06c24cb9deda1da9bea88aeb':
  Fix RoundRect radius.

9 years agoam 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and...
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:09 +0000 (00:08 +0000)]
am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev

* commit '2b98abde26aa2033562b48d635d6f2ba11c48908':
  Use right colors for status bar and nav bar.

9 years agoam 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:05 +0000 (00:08 +0000)]
am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev

* commit '6fa9d5546fa27665de3f64564897a77735b2a1b0':
  Better shadows.

9 years agoam 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:01 +0000 (00:08 +0000)]
am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev

* commit '5bc625d83d60fbb27ab2297051971be91fb3e415':
  Fix layoutlib tests.

9 years agoam 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:02:18 +0000 (00:02 +0000)]
am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev

* commit '44b5a1c8471ef5e1cd3dcfffec5a9e439f228766':
  Update JRE for runConfigurations.

9 years agoam cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:02:06 +0000 (00:02 +0000)]
am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev

* commit 'cbb4ec78675c8179cdedafba1972ac062844c70a':
  Fix project settings. [DO NOT MERGE]

9 years agoam a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:58 +0000 (00:01 +0000)]
am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev

* commit 'a16bb347e120ba17e87f33ff0364380211d01baf':
  Fix RoundRect radius.

9 years agoam 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into...
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:53 +0000 (00:01 +0000)]
am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev

* commit '8f9ebc65939ed3ac2e7fdc135e8513fd8d65daaf':
  Use right colors for status bar and nav bar.

9 years agoam 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:49 +0000 (00:01 +0000)]
am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev

* commit '0b76cf6ff56c59a04783714d40163576e3081cf1':
  Better shadows.

9 years agoam a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:43 +0000 (00:01 +0000)]
am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev

* commit 'a62a18e341180ccf6f5379a7d753584f6cee2e7c':
  Fix layoutlib tests.

9 years agoam e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:18 +0000 (23:55 +0000)]
am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev

* commit 'e541f35055709ec43407649b8517639ff00e42d6':
  Update JRE for runConfigurations.

9 years agoam 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:14 +0000 (23:55 +0000)]
am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev

* commit '6f5fac817abee63d9211e8e43646196950c43707':
  Fix project settings. [DO NOT MERGE]

9 years agoam 44fea603: Merge "Fix RoundRect radius." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:10 +0000 (23:55 +0000)]
am 44fea603: Merge "Fix RoundRect radius." into lmp-dev

* commit '44fea60376e4e851b07eb365fd581c5b9404611f':
  Fix RoundRect radius.

9 years agoam 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:06 +0000 (23:55 +0000)]
am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev

* commit '3bd5cbb1f3d837d7799fb4b33b4dda99adbeeeb4':
  Use right colors for status bar and nav bar.

9 years agoam 34751c79: Merge "Better shadows." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:02 +0000 (23:55 +0000)]
am 34751c79: Merge "Better shadows." into lmp-dev

* commit '34751c79d6696054b19b5fd0e2946c1dbe5bd9bd':
  Better shadows.

9 years agoam 311a0f54: Merge "Fix layoutlib tests." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:54:58 +0000 (23:54 +0000)]
am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev

* commit '311a0f54ac95a1649474498748fff8327b0c917d':
  Fix layoutlib tests.

9 years agoMerge "Update JRE for runConfigurations." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:52:28 +0000 (23:52 +0000)]
Merge "Update JRE for runConfigurations." into lmp-dev

9 years agoMerge "Fix project settings. [DO NOT MERGE]" into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:52:17 +0000 (23:52 +0000)]
Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev

9 years agoMerge "Fix RoundRect radius." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:51:48 +0000 (23:51 +0000)]
Merge "Fix RoundRect radius." into lmp-dev

9 years agoMerge "Use right colors for status bar and nav bar." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:51:29 +0000 (23:51 +0000)]
Merge "Use right colors for status bar and nav bar." into lmp-dev

9 years agoMerge "Better shadows." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:51:10 +0000 (23:51 +0000)]
Merge "Better shadows." into lmp-dev

9 years agoMerge "Fix layoutlib tests." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:50:53 +0000 (23:50 +0000)]
Merge "Fix layoutlib tests." into lmp-dev

9 years agoBetter shadows.
Deepanshu Gupta [Wed, 4 Feb 2015 03:02:15 +0000 (19:02 -0800)]
Better shadows.

Better shadows for rectangles and rounded rectangles (includes circles).

The shadow painting code is mostly from CardView library, but modified
heavily since CardView needs to draw the shadow inside view bounds.

Change-Id: I88c9f19b1c16839b8d6db6df2bebff126fa5a9a3

9 years agoFix RoundRect radius.
Deepanshu Gupta [Tue, 24 Mar 2015 18:34:34 +0000 (11:34 -0700)]
Fix RoundRect radius.

Android APIs use radius for measuring the corner's curvature, but Java2D
APIs use diameter. Add the missing conversion.

Change-Id: I630fc8712e8301324c641885c0c4adf644d13b7e

9 years agoImageReader: Switch to RAW16 from RAW_SENSOR
Eino-Ville Talvala [Fri, 20 Feb 2015 00:28:08 +0000 (16:28 -0800)]
ImageReader: Switch to RAW16 from RAW_SENSOR

Change-Id: I6362a997b0895686f988896de0463d834354f238

9 years agoAdd DEPTH image formats, support in ImageReader
Eino-Ville Talvala [Thu, 26 Feb 2015 18:57:55 +0000 (10:57 -0800)]
Add DEPTH image formats, support in ImageReader

- Add an explicit mapping between public ImageFormat/
  PixelFormat enums and internal HAL format/dataspace.
- Add DEPTH16 and DEPTH_POINT_CLOUD formats
- Wire up mapping layer to ImageReader to support depth
  formats

Change-Id: I8197eccef900cc91baddcfcb934ccd4d8c972eff

9 years agoCamera: update createStream API to add new rotation field
Yin-Chia Yeh [Thu, 12 Mar 2015 20:39:26 +0000 (13:39 -0700)]
Camera: update createStream API to add new rotation field

Change-Id: I0f4343a0bfa7bf09ba887c78a1da1c08daa35333

9 years agoCamera: add @hide API for setting camera rotation
Yin-Chia Yeh [Mon, 9 Mar 2015 23:53:14 +0000 (16:53 -0700)]
Camera: add @hide API for setting camera rotation

Only adding API header. Haven't filled in implementation.

Change-Id: I99a1c84d194dd20562845a0f566dd10ddb3041b7

9 years agoCamera2: Add camera pose and distortion fields
Eino-Ville Talvala [Mon, 9 Feb 2015 23:56:40 +0000 (15:56 -0800)]
Camera2: Add camera pose and distortion fields

- android.lens.info.poseRotation
- android.lens.info.poseTranslation
- android.lens.info.intrinsicCalibration
- android.lens.info.radialDistortion

Change-Id: I3f8cf258b600bc58d0743e44aa6c456cd4b8a906

9 years agoCamera2: Wire depth formats into StreamConfigurationMap
Eino-Ville Talvala [Thu, 5 Mar 2015 23:42:49 +0000 (15:42 -0800)]
Camera2: Wire depth formats into StreamConfigurationMap

Change-Id: I9046b60dca83d090efd9c74c98bfdfebdeae8751

9 years agoCamera2: Remove unused parameters in ICameraDeviceUser#createStream
Eino-Ville Talvala [Mon, 23 Feb 2015 23:20:51 +0000 (15:20 -0800)]
Camera2: Remove unused parameters in ICameraDeviceUser#createStream

- width, height, format are unused

Change-Id: I26540aab1118108b0325df69cfa2dd23da41849b

9 years agocamera2: update API txt for the API change
Zhijun He [Sat, 24 Jan 2015 01:30:31 +0000 (17:30 -0800)]
camera2: update API txt for the API change

Change-Id: I4a9476849f5fde9dff669876bbdaf055bd3adc48

9 years agoCamera2: update generated code
Zhijun He [Wed, 11 Mar 2015 18:03:54 +0000 (11:03 -0700)]
Camera2: update generated code

To solve the cherry-pick out of order issue.

Change-Id: If74a87005914dcd3fd15808482fcac4d0f70bae7

9 years agocamera2: Clarify the documentation on the ImageReader usecase
Martin Storsjo [Wed, 19 Nov 2014 09:58:03 +0000 (11:58 +0200)]
camera2: Clarify the documentation on the ImageReader usecase

Uncompressed JPEG data is an oxymoron. Also mention the other
usecases for ImageReader.

Change-Id: I75261baf162a58c415705db99afa474c3826f900

9 years agoCamera2: framework updates for HAL3.3 keys
Yin-Chia Yeh [Fri, 30 Jan 2015 18:47:22 +0000 (10:47 -0800)]
Camera2: framework updates for HAL3.3 keys

1. Return new keys in legacy shim
2. Codegened doc update from the spec change
3. Remove DISABLED mode from available scene mode list to ensure
   DISABLED is listed iff scene mode is not supported

Change-Id: If3dc74ea7e0fe6135722723f211024b604094f59

9 years agoCamera2: Add hidden depth stream configuration tags
Eino-Ville Talvala [Mon, 23 Feb 2015 23:55:55 +0000 (15:55 -0800)]
Camera2: Add hidden depth stream configuration tags

Change-Id: Iec1ceb894d90210bc3ab06acc92dcbbe42b74465

9 years agoCameraManager: implement flashlight controls
Chien-Yu Chen [Wed, 11 Feb 2015 19:23:28 +0000 (11:23 -0800)]
CameraManager: implement flashlight controls

Implement the flashlight controls and callbacks and update the
torch mode states.

Bug: 2682206
Change-Id: I59025f34f9ece75dd535166a25c428b8d68c6e4b

9 years agoCameraManager: add torch mode APIs for flashlight
Chien-Yu Chen [Fri, 9 Jan 2015 23:52:37 +0000 (15:52 -0800)]
CameraManager: add torch mode APIs for flashlight

Add torch mode APIs to support flashlight without opening any
camera devices.

Bug: 2682206
Change-Id: Ifb66c309f23fd7e9f124016e0d9c6b364d19acdd

9 years agoCamera2: add lens facing EXTERNAL enum
Zhijun He [Mon, 12 Jan 2015 23:16:56 +0000 (15:16 -0800)]
Camera2: add lens facing EXTERNAL enum

This is for usb camera support

Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b

9 years agoCamera2: metadata spec update for reprocessing
Zhijun He [Thu, 29 Jan 2015 23:26:05 +0000 (15:26 -0800)]
Camera2: metadata spec update for reprocessing

Change-Id: I37eda90970eace23c42ba9106d4db1587df8d1b4

9 years agoCamera: codegen doc update
Yin-Chia Yeh [Fri, 20 Feb 2015 23:52:06 +0000 (15:52 -0800)]
Camera: codegen doc update

Codegen doc update only.

Change-Id: I444d59effb957e58b14c363174693cd6c7c84ebd

9 years agoCamera2: lens shading related HAL3.3 update
Yin-Chia Yeh [Fri, 6 Feb 2015 23:15:53 +0000 (15:15 -0800)]
Camera2: lens shading related HAL3.3 update

Codegen doc update.

Change-Id: I0e997b3e6fde7636bef3accdd0f8b7b969d37afa

9 years agoCamera2: add precapture trigger CANCEL
Zhijun He [Mon, 9 Feb 2015 18:40:49 +0000 (10:40 -0800)]
Camera2: add precapture trigger CANCEL

Bug: 19265647
Change-Id: I8f94ee5ace6dd3040ee2f350d589e24e53694f1b