OSDN Git Service
Alexandru-Andrei Rotaru [Thu, 3 Aug 2017 14:04:49 +0000 (14:04 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." am:
5027dd1026 -s ours
am:
54c1b9e936
Change-Id: I93d2bda3aacb51e1db8a03c4ebce90aeb4812506
Alexandru-Andrei Rotaru [Thu, 3 Aug 2017 13:53:53 +0000 (13:53 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed."
am:
5027dd1026 -s ours
Change-Id: I03d1d03f4e4e1b1dfcf68da3aa21913506739619
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 10:40:54 +0000 (10:40 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""" am:
82d2bd4e40
am:
f9caecd124
Change-Id: I69e18dc2838c9472b6962a181d3faa0873b27e38
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 10:30:05 +0000 (10:30 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."""
am:
82d2bd4e40
Change-Id: I8d1fe014fdc3cfd190c5ce95ec963fa8c038552c
Treehugger Robot [Thu, 3 Aug 2017 10:29:55 +0000 (10:29 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed."
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 10:15:24 +0000 (10:15 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."""
John Reck [Wed, 2 Aug 2017 23:55:41 +0000 (23:55 +0000)]
Merge "Fix compile issue" am:
27b56eb03f
am:
60c65f1a67
Change-Id: I8ee620ac2fec24c56a40f2b9be1aa0665a0146bf
John Reck [Wed, 2 Aug 2017 23:47:23 +0000 (23:47 +0000)]
Merge "Fix compile issue"
am:
27b56eb03f
Change-Id: I052fdfdc4f3a75f9ddaa6e9e445d706e22574113
Steven Moreland [Wed, 2 Aug 2017 23:44:30 +0000 (23:44 +0000)]
Merge "com.android.server: use proper nativehelper headers" am:
41a7f5a64f -s ours
am:
79e124c9c7 -s ours
Change-Id: I550d6ce82513fc8e160597ba2ff89b6c5efa286a
Treehugger Robot [Wed, 2 Aug 2017 23:25:32 +0000 (23:25 +0000)]
Merge "Fix compile issue"
Steven Moreland [Wed, 2 Aug 2017 23:19:33 +0000 (23:19 +0000)]
Merge "com.android.server: use proper nativehelper headers"
am:
41a7f5a64f -s ours
Change-Id: I470a1998cecb2254f38ea62b08e2408b9b3d4567
Treehugger Robot [Wed, 2 Aug 2017 23:02:04 +0000 (23:02 +0000)]
Merge "com.android.server: use proper nativehelper headers"
Josh Gao [Wed, 2 Aug 2017 22:13:08 +0000 (22:13 +0000)]
Merge "zygote: always log process exit reason." am:
b14694b043
am:
1453059ae3
Change-Id: I024a43786efaa28c4dfc823066d7afdb135572af
Josh Gao [Wed, 2 Aug 2017 22:04:14 +0000 (22:04 +0000)]
Merge "zygote: always log process exit reason."
am:
b14694b043
Change-Id: Iaa68234674edb9494e518184ee72b1130831cfc9
John Reck [Wed, 29 Jun 2016 22:11:23 +0000 (15:11 -0700)]
Fix compile issue
Change-Id: Ic3423cfb23c6057210efb2e9110551b694c0101c
(cherry picked from commit
9688a3d33451134d6ff54f7b60f8db7a338a40f1)
Treehugger Robot [Wed, 2 Aug 2017 21:50:44 +0000 (21:50 +0000)]
Merge "zygote: always log process exit reason."
Steven Moreland [Wed, 2 Aug 2017 21:35:46 +0000 (21:35 +0000)]
Merge "services.core: remove use of -static hidl java" into stage-aosp-master
am:
e79a0931f7
Change-Id: Ia87ef00c10528b161e36631726513d0b87845cc0
TreeHugger Robot [Wed, 2 Aug 2017 21:22:49 +0000 (21:22 +0000)]
Merge "services.core: remove use of -static hidl java" into stage-aosp-master
Steven Moreland [Tue, 1 Aug 2017 17:18:40 +0000 (10:18 -0700)]
com.android.server: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: com.android.server finds headers
Bug:
63762847
Merged-In: Icb3018f520004f65e8dd565d6e1d563551548eba
Change-Id: Ib36fec53c30760af5dac4097b3eceda6c4c6c7f0
Chien-Yu Chen [Wed, 2 Aug 2017 19:56:55 +0000 (19:56 +0000)]
Merge "camera2: Fix template requirements" into oc-dev
am:
2976109d89
Change-Id: I26487e8565aa190cff6e470bfdbc312b5ec83ceb
Josh Gao [Wed, 2 Aug 2017 19:54:05 +0000 (12:54 -0700)]
zygote: always log process exit reason.
Multiple people have run into problems where apps disappear without a
trace. Always log process exit, so that it's clear when a process is
intentionally exiting. (The amount of extraneous logging this generates
is probably minimal.)
Test: none
Change-Id: I77169da4d0f05dabfe38490757975ad7ad0247b2
TreeHugger Robot [Wed, 2 Aug 2017 19:43:31 +0000 (19:43 +0000)]
Merge "camera2: Fix template requirements" into oc-dev
Steven Moreland [Wed, 2 Aug 2017 18:03:38 +0000 (18:03 +0000)]
Merge "fingerprint: remove use of -static hidl java" into stage-aosp-master
am:
5de8c0ee40
Change-Id: I48d84d0d28d476dae84201b68e943e3ad4dae500
TreeHugger Robot [Wed, 2 Aug 2017 17:55:25 +0000 (17:55 +0000)]
Merge "fingerprint: remove use of -static hidl java" into stage-aosp-master
Chad Brubaker [Wed, 2 Aug 2017 17:27:51 +0000 (17:27 +0000)]
Merge "Add owners for the network security config" am:
8773730cd9
am:
e9d50c793a
Change-Id: Id183ac68171c94d082c992bd3e986c136d6c7764
Chad Brubaker [Wed, 2 Aug 2017 17:20:16 +0000 (17:20 +0000)]
Merge "Add owners for the network security config"
am:
8773730cd9
Change-Id: I18b8aac4c1ac85bde3e6735e1afe6375f5c0e177
Treehugger Robot [Wed, 2 Aug 2017 17:10:11 +0000 (17:10 +0000)]
Merge "Add owners for the network security config"
Sundong Ahn [Wed, 2 Aug 2017 17:05:56 +0000 (17:05 +0000)]
Merge "Add hwbinder library" am:
49e2a9a612
am:
811027ede7
Change-Id: Idec0d080a65d96ff866969f47e9902e40e800fdf
Sundong Ahn [Wed, 2 Aug 2017 16:57:50 +0000 (16:57 +0000)]
Merge "Add hwbinder library"
am:
49e2a9a612
Change-Id: I3c7528dcf98bf3b92843594172531fd30a5f29d4
Stan Iliev [Wed, 2 Aug 2017 16:52:20 +0000 (16:52 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise" am:
8c9e5c81ad
am:
98eaf41eec
Change-Id: I3760a36d915f495fe8d4e457982440ff61934a6b
Treehugger Robot [Wed, 2 Aug 2017 16:46:42 +0000 (16:46 +0000)]
Merge "Add hwbinder library"
Stan Iliev [Wed, 2 Aug 2017 16:44:22 +0000 (16:44 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise"
am:
8c9e5c81ad
Change-Id: I5d696089e13dc68115451c223646ef5e0688b330
Treehugger Robot [Wed, 2 Aug 2017 16:29:23 +0000 (16:29 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise"
Steven Moreland [Wed, 2 Aug 2017 16:02:13 +0000 (09:02 -0700)]
fingerprint: remove use of -static hidl java
These libraries are being removed. Now, the regular java
library can be used as both a static and non-static library,
we are removing these duplicate libraries which cause
several types problems (such as undefined behavior when
both the static and non-static libs are loaded).
Bug:
36376126
Test: boot marlin, add/use fingerprint, check logs
Change-Id: I546d8f5d5788a31b3f70009e687246a4b7e59569
Felipe Leme [Wed, 2 Aug 2017 16:00:39 +0000 (16:00 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
am:
c8f0fd7076
Change-Id: I3a2419aa6244f01a54211ab60558cc729c29249e
Felipe Leme [Wed, 2 Aug 2017 15:52:05 +0000 (15:52 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
Steven Moreland [Wed, 2 Aug 2017 15:22:09 +0000 (15:22 +0000)]
Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master
am:
7d7c269944
Change-Id: Ie9058f2b554d2d88d31b4bc66ac56d4bf735704d
TreeHugger Robot [Wed, 2 Aug 2017 15:08:37 +0000 (15:08 +0000)]
Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master
Jonathan Basseri [Wed, 2 Aug 2017 02:06:55 +0000 (02:06 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am:
85a215bae7
am:
7728849a39
Change-Id: Id7f000e7a67c53c8c3d26482a7d1697255943bf7
Jonathan Basseri [Wed, 2 Aug 2017 01:58:18 +0000 (01:58 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
am:
85a215bae7
Change-Id: I30dddd90e5984519219865752f563a45962be593
Jonathan Basseri [Wed, 2 Aug 2017 01:44:09 +0000 (01:44 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
Jonathan Basseri [Wed, 2 Aug 2017 01:10:47 +0000 (01:10 +0000)]
Revert "Move getNetworkCountryIso impl from TM to PIM."
This reverts commit
6f4657363cac93ddcc718d9716e3b138f770f2e2.
Change-Id: Ie0062369198af03441c531cd2181ed9c12b8f012
Stan Iliev [Wed, 27 Jul 2016 22:08:06 +0000 (18:08 -0400)]
Delete dead code function SpotShadow::makeClockwise
Delete SpotShadow::makeClockwise, which is unused and does
not link when compiler optimizations are disabled (for debugging).
SpotShadow::makeClockwise calls non-existent function
ShadowTessellator::isClockwise, which only works because the
optimizer deletes the function.
Change-Id: Ib8a014bf168782772faa1da7d75a079c1fd28ed9
(cherry picked from commit
fdb625a309755fb762c448dd8c2c4e3a7cc26021)
Felipe Leme [Wed, 2 Aug 2017 00:26:39 +0000 (00:26 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev
am:
6829a1dace
Change-Id: I00eed7ae9679f117296ad1f7162e057720e69aab
Steven Moreland [Tue, 1 Aug 2017 23:34:40 +0000 (16:34 -0700)]
services.core: remove use of -static hidl java
These libraries are being removed. Now, the regular java
library can be used as both a static and non-static library,
we are removing these duplicate libraries which cause
several types problems (such as undefined behavior when
both the static and non-static libs are loaded).
Bug:
36376126
Test: boot marlin device
Merged-In: I6acb6a41fd5c62a3070ada373aed11706c423463
Change-Id: I6acb6a41fd5c62a3070ada373aed11706c423463
TreeHugger Robot [Wed, 2 Aug 2017 00:08:15 +0000 (00:08 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev
Chad Brubaker [Tue, 1 Aug 2017 20:03:06 +0000 (13:03 -0700)]
Add owners for the network security config
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I9bb8f5ceaae4a1af8c93f5416a6a5cea42915c62
Jonathan Basseri [Tue, 1 Aug 2017 22:44:01 +0000 (22:44 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." am:
58bbef15d8
am:
02cc8151a6
Change-Id: Ie3ef6584785cf976cd14fd9143bcf83c20506500
Jonathan Basseri [Tue, 1 Aug 2017 22:34:44 +0000 (22:34 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM."
am:
58bbef15d8
Change-Id: I8a97c049b97eca25a03f7cfcbe57eb6729c6741b
Jonathan Basseri [Tue, 1 Aug 2017 22:25:28 +0000 (22:25 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM."
Jonathan Basseri [Wed, 19 Jul 2017 20:44:31 +0000 (13:44 -0700)]
Move getNetworkCountryIso impl from TM to PIM.
This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.
Bug:
63050313
Test: no compilation errors
Change-Id: I8463af8ed427b73b57a4076c0ff79f055c697657
Andrew Solovay [Tue, 1 Aug 2017 21:21:01 +0000 (21:21 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
am:
d71cc3b72e
Change-Id: Ifc47ddab2329814e39022b51510f4264937a3c04
Andrew Solovay [Tue, 1 Aug 2017 21:07:18 +0000 (21:07 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
Ruchi Kandoi [Tue, 1 Aug 2017 20:51:30 +0000 (20:51 +0000)]
Merge "Set default value for T3T_PMM." am:
7770adf755
am:
1decea7847
Change-Id: Ic1548d625c7a3e025af95cd329dd9d4e5f69caef
Ruchi Kandoi [Tue, 1 Aug 2017 20:40:33 +0000 (20:40 +0000)]
Merge "Set default value for T3T_PMM."
am:
7770adf755
Change-Id: I31da06276b222d597b3834b4b912f4e0930ee6bc
Ruchi Kandoi [Tue, 1 Aug 2017 20:30:50 +0000 (20:30 +0000)]
Merge "Set default value for T3T_PMM."
Steven Moreland [Tue, 1 Aug 2017 17:18:40 +0000 (10:18 -0700)]
com.android.server: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: com.android.server finds headers
Bug:
63762847
Change-Id: Icb3018f520004f65e8dd565d6e1d563551548eba
Felipe Leme [Mon, 31 Jul 2017 18:34:14 +0000 (11:34 -0700)]
Clarifies how the autofill service should check for signature hashes.
Test: m update-api
Bug:
64125551
Fixes:
63991811
Change-Id: I1ba66787ef91c0fc5fab20b5e9e9fd47aee46412
Love Khanna [Tue, 1 Aug 2017 13:02:59 +0000 (18:32 +0530)]
Set default value for T3T_PMM.
If HCEF Application does not provide the T3T PMM value, set the
default value (
FFFFFFFFFFFFFFFF) as per NCI specification.
Bug:
64112415
Test: CTS Verifier; HCE-F Reader/Emulator Test
Change-Id: I24f212d9bebd978342e4dd04d618572132e7eb4b
Maggie Lee [Tue, 1 Aug 2017 15:02:00 +0000 (15:02 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276
am:
d88f4b723d
Change-Id: I538ec037d1eb1b2ef8970d527a2d9aa53fd7fad8
Andriy Naborskyy [Tue, 1 Aug 2017 14:52:13 +0000 (14:52 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b am:
9295f58d26
am:
502986f72a
Change-Id: Idae1def3c8dc80d7f5e3cd83438553cf099541a7
Hugo Benichi [Tue, 1 Aug 2017 14:50:36 +0000 (14:50 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours am:
ff55799950 -s ours
am:
17e2448c26 -s ours
Change-Id: Idc2217a66f60caa783957fd6caeaafa1ff1615bc
Maggie Lee [Tue, 1 Aug 2017 14:47:57 +0000 (14:47 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd
am:
b5da08a276
Change-Id: I5d96dd73affe79880583347e32a95be8510a5462
Andriy Naborskyy [Tue, 1 Aug 2017 14:38:26 +0000 (14:38 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b
am:
9295f58d26
Change-Id: Ifd70690f5e275e89d59a15134427e2bcc91e67c7
Maggie Lee [Tue, 1 Aug 2017 14:37:40 +0000 (14:37 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev
am:
33676dddbd
Change-Id: I7e3a779631c2de4a14521c8dac6d5b2d96ce1b29
Hugo Benichi [Tue, 1 Aug 2017 14:37:06 +0000 (14:37 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours
am:
ff55799950 -s ours
Change-Id: I6d788c5b7cd5c6877799e5a3e0ad865996147b70
Maggie Lee [Tue, 1 Aug 2017 14:31:23 +0000 (14:31 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev
Andriy Naborskyy [Tue, 1 Aug 2017 14:30:05 +0000 (14:30 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev
am:
f18599a15b
Change-Id: Ib1f6b94a4970bbec28d6bbc7de8969c9d5d3975f
Hugo Benichi [Tue, 1 Aug 2017 14:30:02 +0000 (14:30 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
am:
456b91561d -s ours
Change-Id: Ie54e0712dc83514ff3ddcd6cee1b0bd2e80c73ad
Andriy Naborskyy [Tue, 1 Aug 2017 14:16:30 +0000 (14:16 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev
* changes:
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
DO NOT MERGE ANYWHERE ConnectivityService: safer locking
Przemyslaw Szczepaniak [Fri, 28 Jul 2017 13:21:48 +0000 (13:21 +0000)]
Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""
This reverts commit
27c461ab3c683ecb9cce7a0b1950672371b3079f.
I'm taking alternative approach, telephony code will treat "GMT" value as it would be unset. This is fine because GMT is a synthetic value that would never be set from other sources.
Change-Id: I889a844bfd75b7730a5d967065d27de03ef3ce2f
Test: flashed device, tested manually
Bug:
64056758
Andrew Solovay [Tue, 1 Aug 2017 02:13:38 +0000 (19:13 -0700)]
docs: Noted that JobIntentService is usually a better choice
Since IntentService is subject to the O background restrictions,
most devs are better off switching to the new JobIntentService.
(I assume IntentService is not actually deprecated; if it is, tell
me and I'll change this to a @deprecated tag!)
See first comment for doc stage location.
Test: make ds-docs
Bug:
64159987
Change-Id: I83a53d1e6336c2134bf4c61bedd2ae42cd80493a
Sundong Ahn [Thu, 13 Jul 2017 07:34:01 +0000 (16:34 +0900)]
Add hwbinder library
HAL impls will depend hwbinder.jar instead of framework.jar on
build-time, but on runtime framework.jar will be used.
This is to cut the circular dependency when using configstore from
Android framework. Also added JNI call to HwBinder.java to cut
configstore's dependency on systemproperty in framework.jar.
Note that hwbinder.jar is LOCAL_UNINSTALLABLE_MODULE and so it won't be
installed in an actual image.
Bug:
35771640
Test: build & run
Change-Id: I2420298cf9df5d6bbcead3e4451b703ce9bc3e29
Tyler Freeman [Tue, 1 Aug 2017 01:49:11 +0000 (01:49 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours
am:
6b2d37ca25 -s ours
Change-Id: I4b52d3a68a38bb67cc67a99aad4f13ae6ae906bb
Tyler Freeman [Tue, 1 Aug 2017 01:33:44 +0000 (01:33 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours
am:
65d806d043 -s ours
Change-Id: Ie89e28aae64abfc833ed97748654d509cd52c07b
Tyler Freeman [Tue, 1 Aug 2017 01:24:08 +0000 (01:24 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev
am:
a053eaa841 -s ours
Change-Id: If8383edac561ad83edf182ee1c6e9687b180a1c2
Tyler Freeman [Tue, 1 Aug 2017 01:10:44 +0000 (01:10 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev
z00208928 [Fri, 21 Jul 2017 14:26:29 +0000 (22:26 +0800)]
power: gps: add gps read timeout
During download gps file, if network is disconnected, it do not release wakelock
to prevent system to sleep and consume more power until network is connected.
So set gps read tiemout.
Bug:
33469278
Change-Id: I41adf137559d88f76d9da6f63585bfdefc3117b1
Signed-off-by: z00208928 <zhangwei519@huawei.com>
Stanley Tng [Tue, 18 Apr 2017 05:35:45 +0000 (22:35 -0700)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)
There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.
Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug:
36709382
Merged-In: I09720193e38fdf9139e1bb146f8e1847e2b65b1a
(cherry picked from commit
ad4d1d8e28618546953e75d4983335631feb6f2a)
Change-Id: Ifae3adf6e2aad1f0811c03d3114d1bd0452e7c23
Felipe Leme [Fri, 28 Jul 2017 16:14:38 +0000 (09:14 -0700)]
Cherry-picked some Autofill Javadoc improvements from
Test: m update-api
Bug:
64125551
Bug:
63669555
Bug:
63985284
Merged-in: Iba4817f682670e9fd6d891ae221e1fa415252e99
Change-Id: I82cbb54a522b2cf1dfb11aacc9735c932aa9af90
Steven Moreland [Mon, 31 Jul 2017 16:48:25 +0000 (16:48 +0000)]
SurfaceTexture.cpp: use proper nativehelper headers
am:
f53501098c
Change-Id: I2f4eb3fdbfe875d820e52136d8fb72b60e56b046
Steven Moreland [Fri, 28 Jul 2017 17:21:47 +0000 (10:21 -0700)]
SurfaceTexture.cpp: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: SurfaceTexture.cpp finds headers
Bug:
63762847
Change-Id: I3ec1b888c226c2894649d9f9a8f8203891c1ab02
(cherry picked from commit
849252c469396a759c394dc6382470a6a07d6587)
Neil Fuller [Mon, 31 Jul 2017 13:06:44 +0000 (13:06 +0000)]
Merge "Remove redundant TODOs from PackageTracker" am:
01d686b85e
am:
b65356709e
Change-Id: Icbc33207a154b566791210d6c6169235c139562a
Neil Fuller [Mon, 31 Jul 2017 13:00:50 +0000 (13:00 +0000)]
Merge "Remove redundant TODOs from PackageTracker"
am:
01d686b85e
Change-Id: If74fa1bcd6be188079de231e7903795ea7d0b5be
Neil Fuller [Mon, 31 Jul 2017 12:51:05 +0000 (12:51 +0000)]
Merge "Remove redundant TODOs from PackageTracker"
Hugo Benichi [Mon, 31 Jul 2017 01:58:33 +0000 (01:58 +0000)]
Merge "Logging improvements when NetworkCapabilities change" am:
f60a38e152
am:
bdfb4ee19c
Change-Id: Ie7f90ac6b8073e756ff14afcaac7ed291b165e87
Hugo Benichi [Mon, 31 Jul 2017 01:50:38 +0000 (01:50 +0000)]
Merge "Logging improvements when NetworkCapabilities change"
am:
f60a38e152
Change-Id: I886e39db8969eb1ac1dfe06c6f448e53a90fd92c
Treehugger Robot [Mon, 31 Jul 2017 01:38:29 +0000 (01:38 +0000)]
Merge "Logging improvements when NetworkCapabilities change"
Hugo Benichi [Tue, 25 Jul 2017 02:40:56 +0000 (11:40 +0900)]
Logging improvements when NetworkCapabilities change
This patch improves the wtf() logging in updateCapabilities to
better distinguish between the cases of a changed specifiers, changed
transports, or changed capabilities. The case of NOT_METERED being added
or removed is ignored.
Bug:
63326103
Test: runtest frameworks-net, runtest frameworks-wifi
Merged-In: I05c6e78891e1eac658f1cf883223af520a9a4f8f
Merged-In: I4f6cbc0adb461cef6610460daeba72ca38b8f10c
Merged-In: I165a8bbe8362100f1e2bb909459fb45b1c68d5ae
Merged-In: Iec6d92e9a3a12bab87c5adfaf17f776465077060
Merged-In: I633d6347a7f852c27c03fc96b36ca2a60f70c73c
Merged-In: I38739184fc0db105bfd3b4c02cce01e803739e5d
Merged-In: Ia58b877056e2442136cc8b145ac8f4e6560cfc2c
(cherry pick from commit
683ea489d302b494ab40c0d5dc97d352a59d8aa9)
Change-Id: Id32ca66068c8ff549627e8e8c0e50897ef928c58
TreeHugger Robot [Sat, 29 Jul 2017 19:58:54 +0000 (19:58 +0000)]
Merge "SurfaceTexture.cpp: use proper nativehelper headers" into oc-dev-plus-aosp
Jeff Sharkey [Sat, 29 Jul 2017 16:04:02 +0000 (16:04 +0000)]
Merge "Add a missing null check" into oc-dev
am:
101fca656d
Change-Id: Ifa868b17837796dec93c93119260a92f4241f624
Jeff Sharkey [Sat, 29 Jul 2017 15:56:14 +0000 (15:56 +0000)]
Merge "Add a missing null check" into oc-dev
Wei Wang [Sat, 29 Jul 2017 03:00:09 +0000 (03:00 +0000)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS. am:
a763fdba09 -s ours am:
452b8f2bd3 -s ours
am:
f173b2a4c3 -s ours
Change-Id: Id1cfb56bffc9bcf477d209efbd3f1eb19aee08d2
Wei Wang [Sat, 29 Jul 2017 02:52:46 +0000 (02:52 +0000)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS. am:
a763fdba09 -s ours
am:
452b8f2bd3 -s ours
Change-Id: Iaee8bab95acf6490e468d1a0df66b6aea6e61398
Wei Wang [Sat, 29 Jul 2017 02:46:12 +0000 (02:46 +0000)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS.
am:
a763fdba09 -s ours
Change-Id: Id38ed8a73decbf2dc3ce4e657e69fe838acb50c1
Wei Wang [Tue, 18 Apr 2017 18:26:26 +0000 (11:26 -0700)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS.
Test: manual
Bug:
36973866
Change-Id: Ia7168f313abebbf3c5c4fc26567ed914f1987a91
(cherry picked from commit
c5706f651a0462e9ae5a91c9a026d44710b1f8ea)
Svet Ganov [Fri, 28 Jul 2017 22:35:06 +0000 (15:35 -0700)]
Add a missing null check
Test: manual
bug::
62755026
Change-Id: Icf719d0e62986febd4d31f22be3e59d83c8e6e09
Chien-Yu Chen [Fri, 28 Jul 2017 21:52:05 +0000 (14:52 -0700)]
camera2: Fix template requirements
STILL_CAPTURE, RECORD, and VIDEO_SNAPSHOT templates are not
guaranteed on depth only devices.
Test: make docs
Bug:
64157646
Change-Id: I1b2db9d919e136d640be0ca04f63b71e4603e542
Svet Ganov [Fri, 28 Jul 2017 21:23:04 +0000 (21:23 +0000)]
Handle case for missing permissions - fix NPE
am:
39cc33f192
Change-Id: I5fc2ebc009baa242bf9848af62a8f9231afa8045
Svet Ganov [Fri, 28 Jul 2017 20:10:33 +0000 (13:10 -0700)]
Handle case for missing permissions - fix NPE
Test: manual
Bug:
62755026
Change-Id: Ie4dddffdb055f6084d9420ae94d0de2a61574bd8