OSDN Git Service

android-x86/frameworks-base.git
7 years agoApp launch test apk change
gopinath [Wed, 14 Jun 2017 04:39:30 +0000 (04:39 +0000)]
App launch test apk change
am: 0a2c9396a2

Change-Id: I2468cfc8f0db8c993ed0203d12bffb5abcd76305

7 years agoMerge "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928
Ying Xu [Wed, 14 Jun 2017 02:33:41 +0000 (02:33 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928
am: 707dc81da1

Change-Id: I37113bddb18b73dbf10b0dc9067dec9311338e86

7 years agoMerge "Adds error codes and maximum RAN/Bands/Channels"
Ying Xu [Wed, 14 Jun 2017 02:25:53 +0000 (02:25 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels"
am: 70373f7928

Change-Id: I1c169772fb1335df4128b186e826f1bed1ca501d

7 years agoMerge "Adds error codes and maximum RAN/Bands/Channels"
Ying Xu [Wed, 14 Jun 2017 02:16:51 +0000 (02:16 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels"

7 years agoMerge "Support associating with an already-paired device" into oc-dev
Eugene Susla [Wed, 14 Jun 2017 00:17:25 +0000 (00:17 +0000)]
Merge "Support associating with an already-paired device" into oc-dev
am: c041c7a34e

Change-Id: I31ab12934cd18aace7aece30fd5551e20e02216e

7 years agoApp launch test apk change
gopinath [Fri, 12 May 2017 22:37:37 +0000 (15:37 -0700)]
App launch test apk change

Support launching the app using the package name.
Remove the unused variables.

b/33226470

Change-Id: I5b3829912782a9fc0c8f09cbd6fa9ee4b5b35314
(cherry picked from commit a00259f47dc480f799a812a00f52e3c887aae4b0)

7 years agoMerge "Support associating with an already-paired device" into oc-dev
TreeHugger Robot [Wed, 14 Jun 2017 00:03:49 +0000 (00:03 +0000)]
Merge "Support associating with an already-paired device" into oc-dev

7 years agoMerge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev
Christopher Tate [Tue, 13 Jun 2017 23:39:28 +0000 (23:39 +0000)]
Merge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev
am: 796b510787

Change-Id: I0659c68ece4fef6d3e93e436a35c960dc341618b

7 years agoMerge "Use UiContext with StrictMode Dialog" into oc-dev
Adam Lesinski [Tue, 13 Jun 2017 23:30:22 +0000 (23:30 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev
am: 9274d87a0e

Change-Id: I559890874c83627283a891f7eb6c4fd46430f618

7 years agoMerge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 23:27:10 +0000 (23:27 +0000)]
Merge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev

7 years agoMerge "Use UiContext with StrictMode Dialog" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 23:16:58 +0000 (23:16 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev

7 years agoMerge "Boost the anim thread priority when doing a bounds animation." into oc-dev
Winson Chung [Tue, 13 Jun 2017 22:53:09 +0000 (22:53 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev
am: 167f0001b8

Change-Id: I4f54c90c54fd81bd399a0198d48ab597feaba217

7 years agoMerge "Boost the anim thread priority when doing a bounds animation." into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 22:43:46 +0000 (22:43 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev

7 years agoMerge "Save overlay paths as user state" into oc-dev
Todd Kennedy [Tue, 13 Jun 2017 22:39:56 +0000 (22:39 +0000)]
Merge "Save overlay paths as user state" into oc-dev
am: 508a5bade6

Change-Id: Icba76fbeef9f4cd2a067fafd65c750f1f95a4ed0

7 years agoMerge "Save overlay paths as user state" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 22:31:36 +0000 (22:31 +0000)]
Merge "Save overlay paths as user state" into oc-dev

7 years agoMerge "Do not CloseGuard KernelID or FieldID" am: 6b70eafae1
Yang Ni [Tue, 13 Jun 2017 22:18:51 +0000 (22:18 +0000)]
Merge "Do not CloseGuard KernelID or FieldID" am: 6b70eafae1
am: d25acf1022

Change-Id: I900b48f94fdbdd1f502de36e3f121f472ea1daf8

7 years agoMerge "Do not CloseGuard KernelID or FieldID"
Yang Ni [Tue, 13 Jun 2017 22:08:06 +0000 (22:08 +0000)]
Merge "Do not CloseGuard KernelID or FieldID"
am: 6b70eafae1

Change-Id: I89390175e3404489991e599a74034e559a527435

7 years agoMerge "Fix issue #62390590: SecurityException in JobIntentService$..." into oc-dev
Dianne Hackborn [Tue, 13 Jun 2017 21:59:47 +0000 (21:59 +0000)]
Merge "Fix issue #62390590:  SecurityException in JobIntentService$..." into oc-dev
am: 69c3a1d45a

Change-Id: I71017d8fd6efee24d437f66b2c5be34068bd3dfc

7 years agoMerge "Fix issue #62390590: SecurityException in JobIntentService$..." into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 21:51:46 +0000 (21:51 +0000)]
Merge "Fix issue #62390590:  SecurityException in JobIntentService$..." into oc-dev

7 years agoMerge "Do not CloseGuard KernelID or FieldID"
Treehugger Robot [Tue, 13 Jun 2017 21:49:46 +0000 (21:49 +0000)]
Merge "Do not CloseGuard KernelID or FieldID"

7 years agoMerge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev
Christopher Tate [Tue, 13 Jun 2017 21:47:20 +0000 (21:47 +0000)]
Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev
am: 630a49aa4e

Change-Id: I2fc48a0117c021ed415ecb06efffb2e41ce567a1

7 years agoMerge "Fix sysui depending on slow bt calls" into oc-dev
Jason Monk [Tue, 13 Jun 2017 21:44:03 +0000 (21:44 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev
am: 02d5b79cf6

Change-Id: I9a1dbc2f382562fb8ced63fd70f1a5e1674285f0

7 years agoMerge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 21:36:45 +0000 (21:36 +0000)]
Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev

7 years agoMerge "Fix sysui depending on slow bt calls" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 21:32:28 +0000 (21:32 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev

7 years agoMerge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
Chad Brubaker [Tue, 13 Jun 2017 21:29:45 +0000 (21:29 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
am: 4a0ea3e88f

Change-Id: Id7b7326f819c9e0389c3ad9db2863e72ec716f83

7 years agoMerge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
Chad Brubaker [Tue, 13 Jun 2017 21:18:23 +0000 (21:18 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev

7 years agoUse UiContext with StrictMode Dialog
Adam Lesinski [Tue, 13 Jun 2017 21:15:19 +0000 (14:15 -0700)]
Use UiContext with StrictMode Dialog

Bug: 62382723
Test: manual
Change-Id: I5cb5ac5de0800b31d0dad7698f9229873ff83e27

7 years agoMerge "Binder: Add more logging on Error" into oc-dev
Andreas Gampe [Tue, 13 Jun 2017 21:14:52 +0000 (21:14 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev
am: ab934ae8e6

Change-Id: I6e320f34429c82ece01a946ecda96cf17252a701

7 years agoFix #62545908 : 'metered' network jobs run without network
Christopher Tate [Tue, 13 Jun 2017 19:12:09 +0000 (12:12 -0700)]
Fix #62545908 : 'metered' network jobs run without network

Test: JobSchedulerTestApp

Change-Id: I9c15022f5542163a27c6aaa4c3ee6b677cffd699

7 years agoMerge "Binder: Add more logging on Error" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 21:03:38 +0000 (21:03 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev

7 years agoMerge "Add updateMethod callback" am: a0974dbc0f
Robert Greenwalt [Tue, 13 Jun 2017 20:59:09 +0000 (20:59 +0000)]
Merge "Add updateMethod callback" am: a0974dbc0f
am: 7791ac2e28

Change-Id: I3402217fddc77d03b191ac7af0d938c6fa931486

7 years agoMerge "Add updateMethod callback"
Robert Greenwalt [Tue, 13 Jun 2017 20:51:39 +0000 (20:51 +0000)]
Merge "Add updateMethod callback"
am: a0974dbc0f

Change-Id: I9dc2564d0856db617c0deb6bff35ca3cf6b6010c

7 years agoMerge "remove the lock-use for prunePrintService in case blocking main thread" am...
yangbingqian [Tue, 13 Jun 2017 20:48:10 +0000 (20:48 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread" am: b124bea782
am: 60246acdbf

Change-Id: If773ac8166bee1e92168f4df7a9de2dd7cea190f

7 years agoMerge "remove the lock-use for prunePrintService in case blocking main thread"
yangbingqian [Tue, 13 Jun 2017 20:41:03 +0000 (20:41 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread"
am: b124bea782

Change-Id: Ie93b79dfff5787cb9835c4ba86e3aa586e0d2ad8

7 years agoMerge "Add updateMethod callback"
Robert Greenwalt [Tue, 13 Jun 2017 20:38:49 +0000 (20:38 +0000)]
Merge "Add updateMethod callback"

7 years agoMerge "Radio Interface changes to pass the encryption object, including the key,to...
Pankaj Kanwar [Tue, 13 Jun 2017 20:38:46 +0000 (20:38 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." am: aadb414f02
am: 717b5bf3e0

Change-Id: I8133ca2e269f74dd2c7b8a17f81de24567fcdc2e

7 years agoMerge "remove the lock-use for prunePrintService in case blocking main thread"
Treehugger Robot [Tue, 13 Jun 2017 20:30:37 +0000 (20:30 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread"

7 years agoMerge "Radio Interface changes to pass the encryption object, including the key,to...
Pankaj Kanwar [Tue, 13 Jun 2017 20:30:36 +0000 (20:30 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem."
am: aadb414f02

Change-Id: I2f2189aa6483dfe17fe6ed7f42e8b23166c67444

7 years agoAdds error codes and maximum RAN/Bands/Channels
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
Change-Id: Ie7865ed2101d9564e26870a8ebbb0ceb7bd9bd1b

7 years agoMerge "Radio Interface changes to pass the encryption object, including the key,to...
Pankaj Kanwar [Tue, 13 Jun 2017 20:22:22 +0000 (20:22 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem."

7 years agoDo not CloseGuard KernelID or FieldID
Yang Ni [Fri, 28 Apr 2017 15:45:40 +0000 (08:45 -0700)]
Do not CloseGuard KernelID or FieldID

Bug: 28053584

Stop CloseGuarding for two reasons:

1) KernelID and FieldID objects are constructed in auto-generated
(RenderScript reflected) Java code. It would be impossible for a user to
explicitly call destroy() on them. Guarding them would leave a lot of
noisy warnings in logcat.

2) These KernelID and FieldID objects are not big compared to other
RenderScript objects, e.g. Allocations. They occupy almost no native
resources except for a native pointer. Leaving their destruction to Java
GC would be completely acceptable, since any delay in reclaiming them is
unlikely to cause memory pressure.

Test: CTS on x86_64 emulator
Change-Id: I587b5561a0b2bdbf0b2e95bf2995c20d5f5faf9d

7 years agoSend ACTION_SHUTDOWN broadcast to manifest receivers
Christopher Tate [Tue, 13 Jun 2017 19:11:09 +0000 (12:11 -0700)]
Send ACTION_SHUTDOWN broadcast to manifest receivers

Fix #36767224
Test: manual

Change-Id: If8f1fa986b9b8f3c426e4c0623bbca6f96b7199c

7 years agoSave overlay paths as user state
Todd Kennedy [Tue, 13 Jun 2017 15:24:32 +0000 (08:24 -0700)]
Save overlay paths as user state

Instead of maintaining a separate structure just for overlay
paths, store them as user state in the package setting. Also
centralize updating the overlay paths to avoid issues with
inconsistent updates.

Fixes: 36561125
Test: Manual
Change-Id: Iac1c987e8650074dbc564e332d5da1950fad6ac5

7 years agoMerge "Binder: Add more logging on Error" am: d9f3a3cf37
Andreas Gampe [Tue, 13 Jun 2017 19:02:21 +0000 (19:02 +0000)]
Merge "Binder: Add more logging on Error" am: d9f3a3cf37
am: e3bda6170d

Change-Id: Iec158813e6892fba5449219e32a7201fae142037

7 years agoMerge "Address issues surrounding freezing by display." into oc-dev
Bryce Lee [Tue, 13 Jun 2017 18:56:53 +0000 (18:56 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev
am: 8ab4d11145

Change-Id: If9ec8e8492ed8249cc99dfe05e97a0cf62ff8dd8

7 years agoMerge "Address issues surrounding freezing by display." into oc-dev
Bryce Lee [Tue, 13 Jun 2017 18:50:57 +0000 (18:50 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev

7 years agoMerge "Binder: Add more logging on Error"
Andreas Gampe [Tue, 13 Jun 2017 18:45:27 +0000 (18:45 +0000)]
Merge "Binder: Add more logging on Error"
am: d9f3a3cf37

Change-Id: I58eb483fff9fa9c4f2519fbd842172f48f1052e9

7 years agoMerge "Binder: Add more logging on Error"
Andreas Gampe [Tue, 13 Jun 2017 18:34:45 +0000 (18:34 +0000)]
Merge "Binder: Add more logging on Error"

7 years agoFix issue #62390590: SecurityException in JobIntentService$...
Dianne Hackborn [Tue, 13 Jun 2017 17:33:19 +0000 (10:33 -0700)]
Fix issue #62390590:  SecurityException in JobIntentService$...

...JobServiceEngineImpl$WrapperWorkItem.complete

When a job is in the process of stopping a job, we should no
longer allow new work to be dispatched for it.

Also there was an issue with how we determine wether a caller
is valid for the current job -- this was only based on the uid
of the currently running job, but of course that context could
be re-used for a new job of the same uid.  Instead, we now create
a different callback binder for each client, so we can identify
the exact client each time it calls back.  (This also allows us
to hang information about why the job last stopped on that
client state, so we can always report it.)

Finally make a bunch of classes final that should have been.

Test: bit CtsJobSchedulerTestCases:*

Change-Id: I1b00dd2da710414dd2898c4d39a5c528d54b95ea

7 years agoFix sysui depending on slow bt calls
Jason Monk [Tue, 13 Jun 2017 16:49:55 +0000 (12:49 -0400)]
Fix sysui depending on slow bt calls

Move calls to a background thread and cache the results to avoid
slowing down sysui when there are too many bluetooth devices.

Test: runtest systemui
Change-Id: Ica10e86ca6b2783c30ed9de68f1a91dc5cfdf068
Fixes: 38118549

7 years agoBinder: Add more logging on Error
Andreas Gampe [Mon, 12 Jun 2017 17:43:05 +0000 (10:43 -0700)]
Binder: Add more logging on Error

Try to add the Error's message to the abort, so that it shows up
when the logcat is missing.

Sample message:

'jni_internal.cc:508] JNI FatalError called: java.lang.Error thrown during binder transaction: java.lang.LinkageError: This is a test.'

(cherry picked from commit 58383ba095f552a58ed416736fe049126c647ffd)

Bug: 62514767
Test: m
Change-Id: I12026bb7a8ec9438db493f135ed5d0177187f702

7 years agoMerge changes I73ae8de1,I58260902 am: 6f11744adc
Narayan Kamath [Tue, 13 Jun 2017 15:45:48 +0000 (15:45 +0000)]
Merge changes I73ae8de1,I58260902 am: 6f11744adc
am: a506180804

Change-Id: I572de6f022670cd14223ada2f5fe6cf6f7a87a98

7 years agoMerge changes I73ae8de1,I58260902
Narayan Kamath [Tue, 13 Jun 2017 15:38:42 +0000 (15:38 +0000)]
Merge changes I73ae8de1,I58260902
am: 6f11744adc

Change-Id: I9b47ae1d3953280a627584902b3bc099e1f907c8

7 years agoRadio Interface changes to pass the encryption object, including the
pkanwar [Mon, 22 May 2017 22:23:38 +0000 (15:23 -0700)]
Radio Interface changes to pass the encryption object, including the
key,to the modem.

We will now pass the ImsiEncryptionInfo object which includes mnc/mcc.
BUG: 35606429
Test: manual
Change-Id: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b

7 years agoMerge changes I73ae8de1,I58260902
Treehugger Robot [Tue, 13 Jun 2017 15:27:09 +0000 (15:27 +0000)]
Merge changes I73ae8de1,I58260902

* changes:
  Binder: Log details of pending exception.
  Binder: Be forceful about a forceful exit.

7 years agoAddress issues surrounding freezing by display.
Bryce Lee [Mon, 12 Jun 2017 21:12:29 +0000 (14:12 -0700)]
Address issues surrounding freezing by display.

The first issue is the animating a display as a consequence of the
freezing due to configuration change during construction. This
additional animation is not expected and interferes with tests
expecting for the original display contents to be shown intact. This
CL addresses the issue by not freezing while the display is not ready
(before construction is finished).

The second problem addressed is book-keeping for
DisplayContentsAnimators in WindowAnimator. Currently, a getter
method is used internally to reference these animators, which
generates them if not present and adds them to the animation
iteration. In the case we set an animation on a display that no
longer exists (which can be the case after unfreezing), we end up
recreating this object. This can lead to us trying to animate a
non-existent DisplayContent. This CL prevents creating an animator
for a non-existent display and adjusts the methods using this getter
to handle this case.

Fixes: 62460846
Fixes: 62461229
Bug: 35486733
Bug: 62541591
Test: go/wm-smoke
Test: open and close projected android auto mode repeatedly and
      ensure display correctness
Test: cts-tradefed run singleCommand cts-dev --module CtsMediaTestCases --test android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay

Change-Id: I60ade6f97440c8fa01b10e36c019865cf1fd0730

7 years agoMerge "Eagerly serialize historical sessions" into oc-dev
Narayan Kamath [Tue, 13 Jun 2017 10:40:48 +0000 (10:40 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev
am: c7ea7effde

Change-Id: Ice68d0de34795a23d9d7364244d564bc48a7d436

7 years agoMerge "Eagerly serialize historical sessions" into oc-dev
Narayan Kamath [Tue, 13 Jun 2017 10:32:22 +0000 (10:32 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev

7 years agoEagerly serialize historical sessions
Narayan Kamath [Mon, 12 Jun 2017 12:34:29 +0000 (13:34 +0100)]
Eagerly serialize historical sessions

mHistoricalSessions maintained a strong reference to a PackageInstallerSession,
which in turn kept references to Bitmaps and other heavy-weight objects around.

Since this field is primarily used for debugging, this change replaces it with
a String dump of the session in question. Each dump takes about 600bytes, which
is comparable to the sizes of the un-serialized raw objects.

Bug: 62485552
Test: Manual

Change-Id: I4949a64b538ab4a97384f4f8bc9a6ef155a4b128

7 years agoMerge "make UpsreamNetworkMonitor the sole source of upstream network information...
Erik Kline [Tue, 13 Jun 2017 08:36:14 +0000 (08:36 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" am: 30a1cf96bb
am: cfaeabb3e3

Change-Id: Idfebb9b79074f21aeccf773cac98aa7839bda9da

7 years agoMerge "make UpsreamNetworkMonitor the sole source of upstream network information"
Erik Kline [Tue, 13 Jun 2017 08:29:06 +0000 (08:29 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information"
am: 30a1cf96bb

Change-Id: I0f7234363f94694ecc4e97d87c7ffb6bb244895d

7 years agoMerge "make UpsreamNetworkMonitor the sole source of upstream network information"
Erik Kline [Tue, 13 Jun 2017 08:20:40 +0000 (08:20 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information"

7 years agoMerge "Only disable Wi-Fi IP serving on specific interface, if available" am: 6428e1a4d4
Erik Kline [Tue, 13 Jun 2017 03:34:55 +0000 (03:34 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available" am: 6428e1a4d4
am: e675273dbc

Change-Id: I99b170ebacc4135d1a09ce1ec3d43f76c6765de4

7 years agoMerge "Only disable Wi-Fi IP serving on specific interface, if available"
Erik Kline [Tue, 13 Jun 2017 03:25:12 +0000 (03:25 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available"
am: 6428e1a4d4

Change-Id: I51f2e1864f5aaf1369e980f44537ab4f4a0e703e

7 years agoMerge "Only disable Wi-Fi IP serving on specific interface, if available"
Treehugger Robot [Tue, 13 Jun 2017 03:13:18 +0000 (03:13 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available"

7 years agomake UpsreamNetworkMonitor the sole source of upstream network information
Erik Kline [Fri, 9 Jun 2017 08:08:52 +0000 (17:08 +0900)]
make UpsreamNetworkMonitor the sole source of upstream network information

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131
Change-Id: I66ce682cf9c31887264a095a4e4638d281d8ed39

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Tue, 13 Jun 2017 02:31:28 +0000 (02:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 7fc501184a  -s ours

Change-Id: I62669a422c38856f0d164a149f6415e59e2b81d4

7 years agoOnly disable Wi-Fi IP serving on specific interface, if available
Erik Kline [Fri, 9 Jun 2017 07:36:29 +0000 (16:36 +0900)]
Only disable Wi-Fi IP serving on specific interface, if available

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131

Change-Id: Ifd9131bad20810ee24c9436d8c0df7a81fae11d5

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 02:18:42 +0000 (02:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoBinder: Add more logging on Error
Andreas Gampe [Mon, 12 Jun 2017 17:43:05 +0000 (10:43 -0700)]
Binder: Add more logging on Error

Try to add the Error's message to the abort, so that it shows up
when the logcat is missing.

Sample message:

'jni_internal.cc:508] JNI FatalError called: java.lang.Error thrown during binder transaction: java.lang.LinkageError: This is a test.'

Bug: 62514767
Test: m
Change-Id: I12026bb7a8ec9438db493f135ed5d0177187f702

7 years agoMerge "Minimal change to ensure events are propagated to the right DividerView."...
Winson Chung [Tue, 13 Jun 2017 01:37:34 +0000 (01:37 +0000)]
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev
am: b1cdc17dfb

Change-Id: I54fcc6a340e24beae112fcd5753a1b60bb586c24

7 years agoMerge "Minimal change to ensure events are propagated to the right DividerView."...
TreeHugger Robot [Tue, 13 Jun 2017 01:18:45 +0000 (01:18 +0000)]
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev

7 years agoMerge "Protect broadcast used in settings for bond cancel" into oc-dev
Marie Janssen [Tue, 13 Jun 2017 00:51:09 +0000 (00:51 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev
am: 68a4c91bb4

Change-Id: I3dc46eca98c859c540d528cb8a4a409587a25383

7 years agoMerge "Protect broadcast used in settings for bond cancel" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 00:45:40 +0000 (00:45 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev

7 years agoMerge "Address IMSI privacy issues." am: ef6b81e5b2
Pankaj Kanwar [Tue, 13 Jun 2017 00:45:04 +0000 (00:45 +0000)]
Merge "Address IMSI privacy issues." am: ef6b81e5b2
am: 91a4d3df01

Change-Id: I15e60cbbff06d7f66e86d755ae87b2e3513ca4a9

7 years agoMerge "Address IMSI privacy issues."
Pankaj Kanwar [Tue, 13 Jun 2017 00:37:13 +0000 (00:37 +0000)]
Merge "Address IMSI privacy issues."
am: ef6b81e5b2

Change-Id: I41c06fc9bf9012f93e10b59c49d5a7314331ea5f

7 years agoMerge "Address IMSI privacy issues."
Pankaj Kanwar [Tue, 13 Jun 2017 00:28:42 +0000 (00:28 +0000)]
Merge "Address IMSI privacy issues."

7 years agoAddress IMSI privacy issues.
pkanwar [Tue, 21 Feb 2017 03:23:55 +0000 (19:23 -0800)]
Address IMSI privacy issues.

Added getCarrierInfoForImsiEncryption and
setCarrierInfoForImsiEncryption methods.

CP from Master

Bug: 35606429
Test: runtest --path ..ImsiEncryptionInfoTest.java
Change-Id: I62bdc8ac5e57b749fc5675c28579ec2d9183643d

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 13 Jun 2017 00:10:34 +0000 (17:10 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia5c4fec39dd96d826c34c06ea398e05fb53e3328
Auto-generated-cl: translation import

7 years agoMerge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev
Wale Ogunwale [Tue, 13 Jun 2017 00:02:11 +0000 (00:02 +0000)]
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev
am: e1e0db8ca9

Change-Id: Ie70addce27b9551323d7c9d8f9576aa118b98114

7 years agoMerge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
Tianjie Xu [Mon, 12 Jun 2017 23:55:23 +0000 (23:55 +0000)]
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
am: f40f297546

Change-Id: I06fa703be593348db7eed68e3905929262e43a9c

7 years agoBinder: Log details of pending exception.
Narayan Kamath [Tue, 18 Apr 2017 16:48:39 +0000 (17:48 +0100)]
Binder: Log details of pending exception.

This was accidentally removed by change d64abfcf93b59500a0d.

Test: manual; verify exception trace is printed in logs.
Bug: 36813403
Bug: 37435516
Change-Id: I73ae8de167c457d56fddb85943a8f08f8913f0f7
(cherry picked from commit ccc9fad9e6abfa3cf082567669cc5d03ec7a3086)

7 years agoBinder: Be forceful about a forceful exit.
Narayan Kamath [Wed, 12 Apr 2017 10:50:10 +0000 (11:50 +0100)]
Binder: Be forceful about a forceful exit.

We were previously using exit(1) when code servicing an IPC threw
any subclass of Error. That made it much harder to diagnose cases
where that happened because :

- exit runs global destructors, which might prove problematic (see
  linked bug).
- such exits are often due to bugs in application code (things like
  AssertionErrors being thrown) but aren't flagged as such by our
  infrastructure, or by humans for that matter.

To address both issues, use FatalError() so that the runtime can dump
more useful information to the logs before it aborts.

Test: manual
Bug: 36813403
Change-Id: I5826090229109dc7cb19f0c3571c609f990cd36a
(cherry picked from commit d64abfcf93b59500a0dba1626e73861848eb4407)

7 years agoMerge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev
Wale Ogunwale [Mon, 12 Jun 2017 23:51:13 +0000 (23:51 +0000)]
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev

7 years agoMerge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
Robert Carr [Mon, 12 Jun 2017 23:45:37 +0000 (23:45 +0000)]
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
am: 42b3610adc

Change-Id: Ib1001156c0a68f695d755da51af5f0548ccbacba

7 years agoMerge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
TreeHugger Robot [Mon, 12 Jun 2017 23:41:57 +0000 (23:41 +0000)]
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev

7 years agoMerge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
TreeHugger Robot [Mon, 12 Jun 2017 23:38:14 +0000 (23:38 +0000)]
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev

7 years agoSupport associating with an already-paired device
Eugene Susla [Sat, 10 Jun 2017 01:03:14 +0000 (18:03 -0700)]
Support associating with an already-paired device

This is required for migration scenario, where device(s) are already
paired(and thus no longer discoverable) but didn't go through companion
flow.
This also fixes a bug with filtering by mac address, which is also relevant to
the use-case of associating a specific device

Test: Pair with a device first, and call associate with a filter with its MAC
address and single device requested. Ensure the device is found.
Ensure only that device is ever returned when filtering by MAC address.
Bug: 62487084
Change-Id: Ic7cc6affc0648ad85b15620e8c3aba4b9fc91aa1

7 years agoMinimal change to ensure events are propagated to the right DividerView.
Winson Chung [Mon, 12 Jun 2017 22:30:14 +0000 (15:30 -0700)]
Minimal change to ensure events are propagated to the right DividerView.

- The RecentsDrawnEvent sent when Recents is first drawn can be racey, if
  it is sent before the configuration change in Divider is dispatched, then
  it will be posted for the old DividerView, which prior to ag/2363241 was
  still sending the correct resize calls (the animation is independent of
  the view).  For now, we register the event handler in Divider, and
  instead proxy it to the current view when it is posted.

Bug: 62528361
Test: go/wm-smoke
Test: Play a movie in Play Movies, ensure the activity is resized

Change-Id: I665b0c6af55dea0db1916f5b041589bf72da3baf

7 years agoMerge "Attempted fix for navigation bar flicker" into oc-dev
Jorim Jaggi [Mon, 12 Jun 2017 23:07:19 +0000 (23:07 +0000)]
Merge "Attempted fix for navigation bar flicker" into oc-dev
am: bbd7dfc0a4

Change-Id: I66814b15777b180596fd91ac8906f9df698a2d19

7 years agoMerge "Attempted fix for navigation bar flicker" into oc-dev
TreeHugger Robot [Mon, 12 Jun 2017 23:01:15 +0000 (23:01 +0000)]
Merge "Attempted fix for navigation bar flicker" into oc-dev

7 years agoMerge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162
Marie Janssen [Mon, 12 Jun 2017 22:57:58 +0000 (22:57 +0000)]
Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162
am: 00bce50dc3

Change-Id: I4235d63f1c9aeb3be8b276c082d707e20f8c1d9a

7 years agoProtect broadcast used in settings for bond cancel
Marie Janssen [Fri, 9 Jun 2017 23:38:19 +0000 (16:38 -0700)]
Protect broadcast used in settings for bond cancel

Test: cancel pairing from notification tray
Bug: 62094630
Change-Id: Ia83a874c1ea9a1d9d5502609f81e94052bb5759c
(cherry picked from commit 977992f3fc9f4f6bb2d1f9536143327a6021c5d1)

7 years agoMerge "Protect broadcast used in settings for bond cancel"
Marie Janssen [Mon, 12 Jun 2017 22:47:00 +0000 (22:47 +0000)]
Merge "Protect broadcast used in settings for bond cancel"
am: 5cfbbce162

Change-Id: Ieb433bca4189ba3d309b417ed6822e836c9468ed

7 years agoMerge "Improve developer docs for storage APIs." into oc-dev
Jeff Sharkey [Mon, 12 Jun 2017 22:45:22 +0000 (22:45 +0000)]
Merge "Improve developer docs for storage APIs." into oc-dev
am: 05b52d8ba5

Change-Id: I36dbac981e7a11819bd120c604f491eca11018a4

7 years agoMerge "Improve developer docs for storage APIs." into oc-dev
Jeff Sharkey [Mon, 12 Jun 2017 22:39:20 +0000 (22:39 +0000)]
Merge "Improve developer docs for storage APIs." into oc-dev

7 years agoMerge "Protect broadcast used in settings for bond cancel"
Marie Janssen [Mon, 12 Jun 2017 22:36:05 +0000 (22:36 +0000)]
Merge "Protect broadcast used in settings for bond cancel"

7 years agoMerge "Don't log all instant app resolutions" into oc-dev
Todd Kennedy [Mon, 12 Jun 2017 21:57:15 +0000 (21:57 +0000)]
Merge "Don't log all instant app resolutions" into oc-dev
am: 3ef0b8260f

Change-Id: Ibcc839c12fd0c23da254992a7147abb1e08d17cc

7 years agoMerge "Don't log all instant app resolutions" into oc-dev
TreeHugger Robot [Mon, 12 Jun 2017 21:51:27 +0000 (21:51 +0000)]
Merge "Don't log all instant app resolutions" into oc-dev

7 years agoMerge changes from topic 'sysui-tooltip' into oc-dev
Vladislav Kaznacheev [Mon, 12 Jun 2017 21:51:10 +0000 (21:51 +0000)]
Merge changes from topic 'sysui-tooltip' into oc-dev
am: 3fbcec5b86

Change-Id: I9ff9e36b3fa7c0e3c0bd4cd2048f9d0ce510399c