OSDN Git Service
Siyamed Sinir [Mon, 19 Jun 2017 17:03:17 +0000 (17:03 +0000)]
Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev
am:
58df6ab93f
Change-Id: Icd240aa9e5881067acd7521e4235692c5a538b29
Siyamed Sinir [Mon, 19 Jun 2017 16:53:11 +0000 (16:53 +0000)]
Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev
Jason Monk [Mon, 19 Jun 2017 15:33:21 +0000 (15:33 +0000)]
Merge "Fix flash of ambient on fp unlock" into oc-dev
am:
c885c24e10
Change-Id: Ibbff840983dc3f15745275d44393645f110b74c1
TreeHugger Robot [Mon, 19 Jun 2017 15:26:11 +0000 (15:26 +0000)]
Merge "Fix flash of ambient on fp unlock" into oc-dev
TreeHugger Robot [Mon, 19 Jun 2017 08:31:31 +0000 (08:31 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" into oc-dr1-dev
TreeHugger Robot [Mon, 19 Jun 2017 04:56:51 +0000 (04:56 +0000)]
Merge "Camera2: copy user tag to HFR request list" into oc-dr1-dev
Ying Xu [Mon, 19 Jun 2017 04:30:23 +0000 (04:30 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" into oc-dr1-dev
Zhijun He [Sun, 18 Jun 2017 23:21:51 +0000 (16:21 -0700)]
Camera2: copy user tag to HFR request list
User tag is not part of native metadata, and need carry over explicitly.
Test: Camera CTS
Bug:
33761753
Change-Id: Ic58783fc204ce71e073f71d0fa50d4d961f4e7ce
Todd Kennedy [Sun, 18 Jun 2017 17:15:12 +0000 (17:15 +0000)]
Merge "Track both framework and app overlays per package" into oc-dev
am:
65ffdba7f7
Change-Id: I4af23140f4d9ecc2c1e9faa09d03eddb22db9dae
Todd Kennedy [Sun, 18 Jun 2017 17:06:17 +0000 (17:06 +0000)]
Merge "Track both framework and app overlays per package" into oc-dev
TreeHugger Robot [Sun, 18 Jun 2017 05:15:31 +0000 (05:15 +0000)]
Merge "AudioService: implement safe volume warning for USB Headsets" into oc-dr1-dev
Lucas Dupin [Sat, 17 Jun 2017 17:20:59 +0000 (17:20 +0000)]
Merge "K-Means color clustering" into oc-dr1-dev
TreeHugger Robot [Sat, 17 Jun 2017 11:29:10 +0000 (11:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 17 Jun 2017 06:10:52 +0000 (06:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 17 Jun 2017 06:07:03 +0000 (06:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f0bdfbc508 -s ours
Change-Id: I2d6f99108a1aa2a170aac8d50cc1cf3398223fd2
TreeHugger Robot [Sat, 17 Jun 2017 05:57:54 +0000 (05:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Sat, 17 Jun 2017 04:22:31 +0000 (21:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6dc3d54f22f40b9079b6a7e55def38409cc48e89
Auto-generated-cl: translation import
Philip P. Moltmann [Sat, 17 Jun 2017 02:55:42 +0000 (02:55 +0000)]
Merge "Only preload selected pages" into oc-dev
am:
314457a424
Change-Id: Id45d32474d29f4e71fa85997088e7a478b659baf
TreeHugger Robot [Sat, 17 Jun 2017 02:49:55 +0000 (02:49 +0000)]
Merge "Only preload selected pages" into oc-dev
Sundeep Ghuman [Sat, 17 Jun 2017 02:26:02 +0000 (02:26 +0000)]
Merge "APs from old scans should not have RSSI values set." into oc-dev
am:
65c00b2f4e
Change-Id: I543f873621ffa26818d6b237d8ed3d1c7769ad98
TreeHugger Robot [Sat, 17 Jun 2017 02:15:02 +0000 (02:15 +0000)]
Merge "APs from old scans should not have RSSI values set." into oc-dev
Bill Yi [Sat, 17 Jun 2017 01:39:16 +0000 (18:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2e2ab20c78bfcf7ab82807c33466fed3116236b
Auto-generated-cl: translation import
Bill Yi [Sat, 17 Jun 2017 01:21:10 +0000 (18:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifcfe6dcd80d6a3877a54a192fcdb019ed87fc99a
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 17 Jun 2017 01:12:02 +0000 (01:12 +0000)]
Merge "Allows to change summary text in a custom view tile." into oc-dr1-dev
Lucas Dupin [Mon, 5 Jun 2017 15:40:39 +0000 (08:40 -0700)]
K-Means color clustering
Test: runtest -x tests/Internal/src/com/android/internal/ml/clustering/KMeansTest.java
Bug:
37014702
Change-Id: Idabc163df5ded362acbe462ae6b351394a36db10
Felipe Leme [Sat, 17 Jun 2017 01:04:08 +0000 (01:04 +0000)]
Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev
am:
215ebb941d
Change-Id: I058b5fd135e4165214116055ccdc04e9d99955b0
Phil Weaver [Sat, 17 Jun 2017 00:59:04 +0000 (00:59 +0000)]
Merge "Separate a11y and autofill view ids" into oc-dev
am:
c91290a6e9
Change-Id: Iec71a9ae34f963ef1f0ce7f6bd09b5af5bbba6e6
TreeHugger Robot [Sat, 17 Jun 2017 00:52:57 +0000 (00:52 +0000)]
Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev
Casey Burkhardt [Sat, 17 Jun 2017 00:52:47 +0000 (00:52 +0000)]
Merge "Resolve 3 inconsistencies in accessibility button API - Unify logic for detecting availability of the accessibility button - Ensure the initial visibility state is propagated to A11yMS - Ensure services only receive availability callbacks for changes" into oc-dev
am:
4ab690a50d
Change-Id: Ia86c49759f9dac2c40b5c28609ab283efb41cd02
Phil Weaver [Sat, 17 Jun 2017 00:45:59 +0000 (00:45 +0000)]
Merge "Separate a11y and autofill view ids" into oc-dev
Casey Burkhardt [Sat, 17 Jun 2017 00:40:57 +0000 (00:40 +0000)]
Merge "Resolve 3 inconsistencies in accessibility button API - Unify logic for detecting availability of the accessibility button - Ensure the initial visibility state is propagated to A11yMS - Ensure services only receive availability callbacks for changes" into oc-dev
Bryce Lee [Fri, 16 Jun 2017 23:24:34 +0000 (23:24 +0000)]
Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev
am:
1e1c5d7b77
Change-Id: I2f402ea2a6003e5306a7bbcf1d7b8d640672d460
Bryce Lee [Fri, 16 Jun 2017 23:15:03 +0000 (23:15 +0000)]
Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev
TreeHugger Robot [Fri, 16 Jun 2017 23:06:31 +0000 (23:06 +0000)]
Merge changes Id60bc858,I32c4eb53,I5b81fb8f into oc-dr1-dev
* changes:
Osu2: add class for managing Wi-Fi network connection
Osu2: setup ProvisionService
Osu2: basic app setup
Felipe Leme [Fri, 16 Jun 2017 23:00:14 +0000 (23:00 +0000)]
Merge "Trim text from autofillvalue when checking for empty." into oc-dev
am:
b3b13ff62c
Change-Id: I5a96a3f2613aeaad1f3d146b5ce6a208b1180851
Felipe Leme [Fri, 16 Jun 2017 22:57:58 +0000 (22:57 +0000)]
Revert "Trim text from autofillvalue when checking for empty."
This reverts commit
c5d4e068f2a0c47dc69b72200f8a9fc4bd5a2c28.
Change-Id: I4027cf0f91ebb9032c21efad7025118891188bc6
Tyler Freeman [Fri, 16 Jun 2017 22:51:28 +0000 (22:51 +0000)]
DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am:
79613777df -s ours am:
cf82b09998 -s ours
am:
2c3ca52a91 -s ours
Change-Id: Iebb31d8ff579fb03e6d814493777ccac96d94eae
TreeHugger Robot [Fri, 16 Jun 2017 22:50:42 +0000 (22:50 +0000)]
Merge "Trim text from autofillvalue when checking for empty." into oc-dev
Tyler Freeman [Fri, 16 Jun 2017 22:43:12 +0000 (22:43 +0000)]
DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am:
79613777df -s ours
am:
cf82b09998 -s ours
Change-Id: I128c5a5b07fc2aef5ada9118e3cc491a87970758
Tyler Freeman [Fri, 16 Jun 2017 22:36:26 +0000 (22:36 +0000)]
DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility.
am:
79613777df -s ours
Change-Id: I965bac24a8d62b44b08679bda58b8ba37dbed5b4
Wale Ogunwale [Fri, 16 Jun 2017 22:21:11 +0000 (22:21 +0000)]
Merge "Log last home activity and result we tried to start" into oc-dev
am:
e8f1a74361
Change-Id: I9dc6c865260e783eeba32b7c86d45b31ab49688c
Tony Mantler [Fri, 16 Jun 2017 22:12:03 +0000 (22:12 +0000)]
Merge "Disable notification sounds on TV" into oc-dev
am:
b5979092b8
Change-Id: I37ec878ac1629e0f145481863b82ad59572c7e73
Felipe Leme [Fri, 16 Jun 2017 21:59:55 +0000 (21:59 +0000)]
Merge "Use an optimized findViewNodeByAutofillId(id) to get just one node." into oc-dev
am:
a89414962d
Change-Id: I70d76618c929bdfeee715909c70a678fbc5f4a3e
Jaewoong Jung [Fri, 16 Jun 2017 01:02:44 +0000 (18:02 -0700)]
Allows to change summary text in a custom view tile.
Now it becomes possible to use META_DATA_PREFERENCE_SUMMARY_URI in
in conjunction with META_DATA_PREFERENCE_CUSTOM_VIEW.
Bug:
62384773
Test: make RunSettingsLibRoboTests -j40
Change-Id: I91401140b2ed0b12c26b91c8fb3d464179e75844
TreeHugger Robot [Fri, 16 Jun 2017 21:57:20 +0000 (21:57 +0000)]
Merge "Log last home activity and result we tried to start" into oc-dev
TreeHugger Robot [Fri, 16 Jun 2017 21:55:28 +0000 (21:55 +0000)]
Merge "Disable notification sounds on TV" into oc-dev
TreeHugger Robot [Fri, 16 Jun 2017 21:45:39 +0000 (21:45 +0000)]
Merge "Use an optimized findViewNodeByAutofillId(id) to get just one node." into oc-dev
Winson Chung [Fri, 16 Jun 2017 21:44:59 +0000 (21:44 +0000)]
Merge changes I20bdab1b,Id82f9081 into oc-dev
am:
64b044680c
Change-Id: I6a15a1b5a97b34fd18f885a0137a8d674b7b6589
Steven Thomas [Fri, 16 Jun 2017 21:36:51 +0000 (21:36 +0000)]
Merge "Enable vr mode and persistent vr mode at device boot" into oc-dr1-dev
Phil Weaver [Thu, 15 Jun 2017 17:10:06 +0000 (10:10 -0700)]
Separate a11y and autofill view ids
Autofill seems to need IDs to be preserved across things
like configuration changes, while accessibility will not
function without views with unique ids. Separating out the
two types of IDs. We can re-combine them once it's clear
that both demands can be satisfied.
Bug:
62301218
Test: Run a11y and autofill CTS, and verify that the play
store app functions with TalkBack after a screen rotation.
Change-Id: I17a99de2874768fc0ade3aa354130dd1f6b4cd7e
Winson Chung [Fri, 16 Jun 2017 21:32:39 +0000 (21:32 +0000)]
Merge changes I20bdab1b,Id82f9081 into oc-dev
* changes:
Fix backwards flag causing crash.
Fixing issue with PiP aspect ratio being clobbered.
Bryce Lee [Fri, 16 Jun 2017 14:20:34 +0000 (07:20 -0700)]
Create native Surface object on updateWindow for legacy apps.
There are some apps that use the Surface object itself to indicate
changes. As a result, recycling the existing Surface object for
updates can lead to such apps ignoring events such as size changes.
This changelist restores the original behavior for legacy apps, where
the underlying native Surface object is recreated during updates.
Fixes:
62108743
Test: go/wm-smoke
Test: Open affected application, observe expansion to fullscreen when
nav bar disappears. Rotate to other orientation and observe
expansion to fullscreen.
Change-Id: I874602b6b8686c6ecb05cf7b1a04ec4b700ad3f9
Todd Kennedy [Fri, 16 Jun 2017 20:55:13 +0000 (13:55 -0700)]
Track both framework and app overlays per package
Always bundle framework and app overlays. The old implementation, where
framework and app overlays were tracked independently, lead to an error
in the following scenario:
1. Enable app overlay -> change reflected in app
2. Enable framework overlay -> error: no change reflected in app
3. Disable app overlay -> change reflected in app, including framework
overlay
This change also leads to better architecture since the package manager
no longer needs to know that an app's overlays consist of both framework
and app specific overlays. Instead, that knowledge is handled by the
overlay manager.
Also, correct indentation in "cmd package dump packages" output and
remove obsolete constant DUMP_ENABLED_OVERLAYS.
Test: Manual
Change-Id: I707fc00052a15b22fb8c17e6155732520e6b2e52
Bug:
62680061
Jeff Davidson [Fri, 16 Jun 2017 20:50:02 +0000 (20:50 +0000)]
Merge "Allow EuiccService IPCs to happen in parallel." into oc-dr1-dev
Felipe Leme [Fri, 16 Jun 2017 20:24:32 +0000 (13:24 -0700)]
Trim text from autofillvalue when checking for empty.
Test: VirtualContainerActivityTest#testSaveDialogNotShownWhenBackIsPressed
Fixes:
62667931
Change-Id: I7e673eedd39fff7af89c694d0bfc5a495f14ea26
Tyler Freeman [Fri, 5 May 2017 00:23:35 +0000 (17:23 -0700)]
DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility.
This is mainly for Wear devices that don't have speakers.
Bug:
37543478
Bug:
37257715
Merged-In: Ia6dffa7e528886e7c84390dbb33b44f298c7afa4
Change-Id: Ia6dffa7e528886e7c84390dbb33b44f298c7afa4
Android Build Merger (Role) [Fri, 16 Jun 2017 20:14:21 +0000 (20:14 +0000)]
Merge "Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev am:
6f87503ed8" into oc-dr1-dev
Alison Cichowlas [Fri, 16 Jun 2017 20:13:06 +0000 (20:13 +0000)]
Merge "Hide power dialog when lockscreen comes and goes." into oc-dr1-dev
Rob Carr [Fri, 16 Jun 2017 20:12:17 +0000 (20:12 +0000)]
Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev
am:
6f87503ed8
Change-Id: I3c951fd2572abbada566494b5954697be098865d
Peter Qiu [Thu, 15 Jun 2017 21:26:24 +0000 (14:26 -0700)]
Osu2: add class for managing Wi-Fi network connection
Also setup a test app for unit tests, with few test
cases added for NetworkConnection.
Bug:
62388032
Test: start OSU app with Boigno OSU provider via adb,
verify the OSU app is started and connected to
the Boingo OSU AP.
Test: frameworks/base/packages/Osu2/tests/runtests.sh
Change-Id: Id60bc85871f3251d83d779d430e1dd1eff47d86e
Android Build Merger (Role) [Fri, 16 Jun 2017 20:06:22 +0000 (20:06 +0000)]
Merge "Merge "Always log new user state to event log" into oc-dev am:
6db4406fbd" into oc-dr1-dev
Fyodor Kupolov [Fri, 16 Jun 2017 20:05:32 +0000 (20:05 +0000)]
Merge "Always log new user state to event log" into oc-dev
am:
6db4406fbd
Change-Id: I5ed5aacfb054a7c7fef91b0ac51cc89541983818
TreeHugger Robot [Fri, 16 Jun 2017 20:04:53 +0000 (20:04 +0000)]
Merge "WallpaperColors refactor" into oc-dr1-dev
Rob Carr [Fri, 16 Jun 2017 19:55:07 +0000 (19:55 +0000)]
Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev
Wale Ogunwale [Fri, 16 Jun 2017 19:42:51 +0000 (12:42 -0700)]
Log last home activity and result we tried to start
To help debug ANR.
Bug:
38121026
Test: manual
Change-Id: I484301810d07dcf7330dfdbab7310eac14638b90
Fyodor Kupolov [Fri, 16 Jun 2017 19:51:00 +0000 (19:51 +0000)]
Merge "Always log new user state to event log" into oc-dev
Tony Mantler [Fri, 16 Jun 2017 17:50:00 +0000 (10:50 -0700)]
Disable notification sounds on TV
Bug:
38495875
Test: BuzzBeepBlinkTest
Change-Id: Iffebe2063de3d73c1538a3bbbe9edd2233005ba3
Peter Qiu [Wed, 14 Jun 2017 17:11:12 +0000 (10:11 -0700)]
Osu2: setup ProvisionService
ProvisionService will be started when the OSU app is
started with "Provision" command. This service will
run on a separate thread from the Main thread, to avoid
blocking on the Main thread. This service doesn't
extend IntentService since it requires to perform
async operations.
Bug:
62388032
Test: am start -n com.android.osu/.MainActivity --es
"com.android.osu.extra.COMMAND" "Provision"
Change-Id: I32c4eb53830a6b0404af085da98f9533346203eb
Jeff Davidson [Fri, 16 Jun 2017 19:39:51 +0000 (19:39 +0000)]
Merge "Define a meta-data attribute for a carrier icon." into oc-dr1-dev
Android Build Merger (Role) [Fri, 16 Jun 2017 19:35:10 +0000 (19:35 +0000)]
Merge "Merge "Throw IAE when service add null AutofillIds on SaveInfo methods." into oc-dev am:
6cde68752c" into oc-dr1-dev
Phil Weaver [Fri, 16 Jun 2017 19:34:11 +0000 (19:34 +0000)]
Merge "Stop rounded corners from confusing magnification" into oc-dr1-dev
Felipe Leme [Fri, 16 Jun 2017 19:34:01 +0000 (19:34 +0000)]
Merge "Throw IAE when service add null AutofillIds on SaveInfo methods." into oc-dev
am:
6cde68752c
Change-Id: I9efd96bcd649bd23db28136aa4afca16a677e9ea
Siyamed Sinir [Fri, 16 Jun 2017 01:22:31 +0000 (18:22 -0700)]
Fix crash during TextView.onCreateContextMenu
Test: bit CtsWidgetTestCases:TextViewTest
Bug:
62450393
Change-Id: I162c28d253ca197eba9c4c148c76179c2880daa5
TreeHugger Robot [Fri, 16 Jun 2017 19:23:37 +0000 (19:23 +0000)]
Merge "Throw IAE when service add null AutofillIds on SaveInfo methods." into oc-dev
TreeHugger Robot [Fri, 16 Jun 2017 19:01:52 +0000 (19:01 +0000)]
Merge "Add right padding to two target preference text area" into oc-dr1-dev
Felipe Leme [Fri, 16 Jun 2017 18:49:48 +0000 (11:49 -0700)]
Use an optimized findViewNodeByAutofillId(id) to get just one node.
Session was using findViewNodesByAutofillIds(ids) before, which not only was
not optimal, but error prone (for example, it could return a non-empty array
with an empty value).
Test: CtsAutoFillServiceTestCases pass
Fixes:
62532979
Change-Id: If984f1263cc3f2aac1d1e098687fe02d73c55211
Philip P. Moltmann [Fri, 16 Jun 2017 18:30:52 +0000 (11:30 -0700)]
Only preload selected pages
Otherwise if only some pages are selected all (non-selected) pages in
between are preloaded.
Test: Selected only some pages of a large document and observed which
pages got preloaded
cts-tradefed run cts-dev -m Print
Fixes:
62296301
Change-Id: I3a97cfa6991e5a95ff73628c4bb540c629160c0c
Todd Kennedy [Fri, 16 Jun 2017 18:19:49 +0000 (18:19 +0000)]
Merge "enable/disable dexopt for instant apps remotely" into oc-dev
am:
5d969b9862
Change-Id: If9f063e5db82c079b7a9e682365a8840ee7da794
TreeHugger Robot [Fri, 16 Jun 2017 18:07:46 +0000 (18:07 +0000)]
Merge "enable/disable dexopt for instant apps remotely" into oc-dev
Winson Chung [Fri, 16 Jun 2017 18:07:29 +0000 (11:07 -0700)]
Fix backwards flag causing crash.
Bug:
62692677
Test: Use an activity options that requires the bitmap copy, ensure
that it does not crash.
Change-Id: I20bdab1b91dfe47f7fe134fd17fe104eb4b27ec1
Fyodor Kupolov [Fri, 16 Jun 2017 17:45:51 +0000 (10:45 -0700)]
Always log new user state to event log
Previously it wasn't logged for stopping users...
Test: manual
Bug:
38121026
Change-Id: I0fc37224ce1043745dfffcc78639f003c35b402e
Winson Chung [Fri, 16 Jun 2017 17:52:40 +0000 (10:52 -0700)]
Fixing issue with PiP aspect ratio being clobbered.
- We should only initialize the initial aspect ratio to the default
aspect ratio once, instead of when the resources are reloaded.
Otherwise, they will be clobbered when the configuration changes.
This is a regression from ag/
2295004.
Bug:
62702553
Test: Set PiP aspect ratio from landscape-locked activity, ensure that
it stays in that aspect ratio after the pip menu dismisses.
Change-Id: Id82f9081c25c7d6482cf7bcf0268fedb9068eabe
Marco Nelissen [Fri, 16 Jun 2017 17:47:15 +0000 (17:47 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours am:
4e5ed845c7 -s ours am:
3cd244e872 -s ours am:
a9bf75f50c -s ours am:
21caf4aee4 -s ours am:
009b3c6aec -s ours
am:
acbd7ba4aa -s ours
Change-Id: I5fda14fc00fe57f090e554c80dd21695420d0058
Marco Nelissen [Fri, 16 Jun 2017 17:38:19 +0000 (17:38 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours am:
4e5ed845c7 -s ours am:
3cd244e872 -s ours am:
a9bf75f50c -s ours am:
21caf4aee4 -s ours
am:
009b3c6aec -s ours
Change-Id: Ied441cf591abb8933a5601c6d36066e0288dfbd7
Marco Nelissen [Fri, 16 Jun 2017 17:24:37 +0000 (17:24 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours am:
4e5ed845c7 -s ours am:
3cd244e872 -s ours am:
a9bf75f50c -s ours
am:
21caf4aee4 -s ours
Change-Id: I25f1f4394b6a5a6b3708df13be41299865e76d52
yinxu [Wed, 31 May 2017 01:04:19 +0000 (18:04 -0700)]
Adds error codes and maximum RAN/Bands/Channels
Added error codes which are mapped from the RadioError which is returned
from RIL, also added some errors which will be generated at telephony.
Those errors will be returned to the user with the onError() callback.
Added the maximun number of RAN/Bands/Channels in 1 scan request.
Test: Telephony sanity tests
Bug:
30954762
Merged-in: Ie7865ed2101d9564e26870a8ebbb0ceb7bd9bd1b
Change-Id: Ie7865ed2101d9564e26870a8ebbb0ceb7bd9bd1b
(cherry picked from commit
a88d1990b7482d94f20f2ba3d04a8eea8543e22d)
Marco Nelissen [Fri, 16 Jun 2017 17:12:09 +0000 (17:12 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours am:
4e5ed845c7 -s ours am:
3cd244e872 -s ours
am:
a9bf75f50c -s ours
Change-Id: Ib75388665c3586c09e963917bc54b020aae22dce
Marco Nelissen [Fri, 16 Jun 2017 16:59:57 +0000 (16:59 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours am:
4e5ed845c7 -s ours
am:
3cd244e872 -s ours
Change-Id: I256e1413df73fd577708d5dcb84074e3a8ed61ab
Marco Nelissen [Fri, 16 Jun 2017 16:51:14 +0000 (16:51 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours
am:
4e5ed845c7 -s ours
Change-Id: Iae9f79e4b91c4ef5e844259709e3055607a781b8
Marco Nelissen [Fri, 16 Jun 2017 16:41:20 +0000 (16:41 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours
am:
035e2a5c37 -s ours
Change-Id: Ib6f84a832e27329e0eabf000b89e93145c43a31a
Tyler Gunn [Fri, 16 Jun 2017 16:28:36 +0000 (16:28 +0000)]
Merge "Add EXTRA_ALWAYS_USE_VOIP_AUDIO_MODE extrs to phone account" into oc-dr1-dev
Lucas Dupin [Tue, 9 May 2017 19:16:19 +0000 (12:16 -0700)]
WallpaperColors refactor
Hiding color extraction into WallpaperColors.
This enables us to create WallpaperColors from a a Bitmap
or Drawable.
Fixes:
62197187
Fixes:
62490115
Test: runtest --path cts/tests/app/src/android/app/cts/WallpaperColorsTest.java
Change-Id: I614cfa205e02b551a141642eac6de21251c3bff6
Marco Nelissen [Fri, 16 Jun 2017 16:26:30 +0000 (16:26 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours
am:
ce4c7df6a0 -s ours
Change-Id: I1fb798481ca56b8c81386792b5642a544aae1c7e
Marco Nelissen [Fri, 16 Jun 2017 16:19:02 +0000 (16:19 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours
am:
45cd809caa -s ours
Change-Id: Idd7b2d2536d1c25072794ba228f33fc2459f2aaa
Marco Nelissen [Fri, 16 Jun 2017 16:11:01 +0000 (16:11 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours
am:
23118a9b77 -s ours
Change-Id: Id314511cf3e6af08e0f00e84e8945ea404b85c6a
Marco Nelissen [Fri, 16 Jun 2017 16:02:19 +0000 (16:02 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours
am:
49fc959be3 -s ours
Change-Id: I0eb248911ce1a582a4939e2bd5419659c586128f
Marco Nelissen [Fri, 16 Jun 2017 15:51:48 +0000 (15:51 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours
am:
398d50feeb -s ours
Change-Id: Ide31821909dde91443cdf650216a6ada7277ce9a
Marco Nelissen [Fri, 16 Jun 2017 15:43:46 +0000 (15:43 +0000)]
libmedia_jni.so doesn't need libjhead.so
am:
9a4a34afd8 -s ours
Change-Id: I557d7e96401b742d916e2eef5aa03949018382c7
TreeHugger Robot [Fri, 16 Jun 2017 15:30:06 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Fri, 16 Jun 2017 15:21:10 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
d97c62a1da -s ours
Change-Id: I0c7cdc5f73d7e4cc05fc3b498d8d59439c3fe1ba