OSDN Git Service
Dan Willemsen [Sat, 9 Sep 2017 19:23:43 +0000 (19:23 +0000)]
Rename aapt_defaults to aapt2_defaults
am:
7544b9cbb9
Change-Id: I4ca38e0aab3fcfc4a4de900b07747e1e55936c01
Dan Willemsen [Sat, 9 Sep 2017 05:44:51 +0000 (22:44 -0700)]
Rename aapt_defaults to aapt2_defaults
So that tools/aapt/Android.bp can have aapt_defaults.
Test: m aapt2
Change-Id: I32e438efb3516d73b347e67297aa09bee91520b1
Felipe Leme [Fri, 8 Sep 2017 21:50:25 +0000 (21:50 +0000)]
Merge "Javadoc: Added alternative to Package verification." into oc-dev am:
092349600d
am:
33d476c170
Change-Id: I6a72e1c2399fd03cd87de61964fc07e0329a8eb9
Felipe Leme [Fri, 8 Sep 2017 21:41:36 +0000 (21:41 +0000)]
Merge "Javadoc: Added alternative to Package verification." into oc-dev
am:
092349600d
Change-Id: Ic765df95fc660fb0df8a0f027d739ea999a36702
TreeHugger Robot [Fri, 8 Sep 2017 21:28:02 +0000 (21:28 +0000)]
Merge "Javadoc: Added alternative to Package verification." into oc-dev
Vinay Kalia [Fri, 8 Sep 2017 20:06:55 +0000 (20:06 +0000)]
Merge "Update ScanSettings documentation for scan modes" am:
8157ab2a0e
am:
be7ccdf6e9
Change-Id: Ib66ed6d6d6e9e1766fa4ed495d3d045b8a6384fe
Vinay Kalia [Fri, 8 Sep 2017 19:58:33 +0000 (19:58 +0000)]
Merge "Update ScanSettings documentation for scan modes"
am:
8157ab2a0e
Change-Id: I15a77489072925f6e99e9a0a658910616164aef3
Vinay Kalia [Fri, 8 Sep 2017 19:50:36 +0000 (19:50 +0000)]
Merge "Update ScanSettings documentation for scan modes"
xutianguo [Fri, 8 Sep 2017 19:50:27 +0000 (19:50 +0000)]
Merge "CachedBluetoothDevice: Simplify ProfleConnectionState check" am:
4e1034cc53
am:
ee50c2e56a
Change-Id: I8e693c2d79a427fef54ce41fbe8045bdbe3bca67
xutianguo [Fri, 8 Sep 2017 19:35:27 +0000 (19:35 +0000)]
Merge "CachedBluetoothDevice: Simplify ProfleConnectionState check"
am:
4e1034cc53
Change-Id: I478f83fae3eed14e4f67bf79825a513143af4fb3
Treehugger Robot [Fri, 8 Sep 2017 19:26:37 +0000 (19:26 +0000)]
Merge "CachedBluetoothDevice: Simplify ProfleConnectionState check"
Elliott Hughes [Fri, 8 Sep 2017 18:24:19 +0000 (18:24 +0000)]
Merge "support chinese character for ota package's path" am:
b8877a981a
am:
7acb5f8e10
Change-Id: I89e7821c20ac131c4d7800264f175e16e945517e
Elliott Hughes [Fri, 8 Sep 2017 18:18:16 +0000 (18:18 +0000)]
Merge "support chinese character for ota package's path"
am:
b8877a981a
Change-Id: I49188d97d04c69ac225422279d393b53c4966984
Elliott Hughes [Fri, 8 Sep 2017 18:07:01 +0000 (18:07 +0000)]
Merge "support chinese character for ota package's path"
Kensuke Matsui [Fri, 8 Sep 2017 15:05:11 +0000 (15:05 +0000)]
Merge "Avoid race condition during grayscale animation of QS tile" am:
bceee1cbb4
am:
36f27fa6f8
Change-Id: I7d7d9b811a08c68403e7a7539793cc4af226571e
Kensuke Matsui [Fri, 8 Sep 2017 14:53:38 +0000 (14:53 +0000)]
Merge "Avoid race condition during grayscale animation of QS tile"
am:
bceee1cbb4
Change-Id: I9a2cddd23d79c1cdd1cee75769f8589be1c9492d
Treehugger Robot [Fri, 8 Sep 2017 14:38:31 +0000 (14:38 +0000)]
Merge "Avoid race condition during grayscale animation of QS tile"
Sudheer Shanka [Fri, 8 Sep 2017 08:59:21 +0000 (08:59 +0000)]
Merge "Shorten the log in the netpolicy dump." am:
8c3e12a904
am:
b10edc74ae
Change-Id: I3d32614df1f9ba3217dfbc6fcfe555db28dccb69
Sudheer Shanka [Fri, 8 Sep 2017 08:47:17 +0000 (08:47 +0000)]
Merge "Shorten the log in the netpolicy dump."
am:
8c3e12a904
Change-Id: I41e80dec4d20c83e51ca212adcacdbab81d309e1
Treehugger Robot [Fri, 8 Sep 2017 08:33:58 +0000 (08:33 +0000)]
Merge "Shorten the log in the netpolicy dump."
Hugo Benichi [Fri, 8 Sep 2017 07:41:13 +0000 (07:41 +0000)]
Merge "NetworkStats: more robust subtraction for deltas" am:
be1e405cc7 -s ours
am:
856ebe37eb -s ours
Change-Id: I38d7b714bd74850a5ffc7c0c26af76dcfd8fb417
Hugo Benichi [Fri, 8 Sep 2017 07:29:15 +0000 (07:29 +0000)]
Merge "NetworkStats: more robust subtraction for deltas"
am:
be1e405cc7 -s ours
Change-Id: Ibdb6876083588ad5c741fe8d45d46d119fd713fd
Sudheer Shanka [Tue, 20 Jun 2017 02:05:31 +0000 (19:05 -0700)]
Shorten the log in the netpolicy dump.
Bug:
65439160
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Merged-In: I105326e733f2498e68b0552b45fec1ed0e8e3179
(cherry picked from commit
db9aaf0322044786a27d85aeb97c39b768f89a49)
Change-Id: Ia1fa5476db4eee4cf39e438ec6aa456c60332c5c
Hugo Benichi [Fri, 8 Sep 2017 07:13:37 +0000 (07:13 +0000)]
Merge "NetworkStats: more robust subtraction for deltas"
xutianguo [Wed, 22 Jun 2016 03:32:00 +0000 (11:32 +0800)]
CachedBluetoothDevice: Simplify ProfleConnectionState check
Check whether ProfileConnectionState is empty instead of checking
whether it is null.
BUG: N/A
Change-Id: I553e7b8b0c1b3ae967dcc0ecd482b7ff19f3c1f6
Signed-off-by: xutianguo <xutianguo@xiaomi.com>
Erik Kline [Fri, 8 Sep 2017 04:41:57 +0000 (04:41 +0000)]
Merge "Support NAT keepalives" am:
6c7c55206d
am:
5c8c836bc4
Change-Id: I3b6b8cbc54d7139c5e2274c63a9dcfb97f166161
Hugo Benichi [Mon, 7 Aug 2017 06:47:35 +0000 (15:47 +0900)]
NetworkStats: more robust subtraction for deltas
This patch ensures that subtract() between two NetworkStats object will
return a delta with no negative entries in all cases.
When the stats delta contains some negative values, there are clamped to
0. Some logging is added when this happens.
This is what's expected by NetworkStatsHistory#recordData().
Bug:
64365917
Bug:
65439160
Test: runtest frameworks-net
Merged-In: I16e97e73f600225f80e0ce517e80c07c6f399196
Merged-In: I2ac0bc3914cb65ae8ee27921856d698dc59624b2
Merged-In: I67d5dc4b52b254748ff17fe1e16c2eeb1d03c30d
Merged-In: Ib488fb034f72c92f19916490981342a3ef2eb33b
(cherry picked from commit
ad5e2827ead7fa8ebafc291ceb6b4672e70c1775)
Change-Id: Ic86b65a65a2517c871221f8784088ec1de18f534
Erik Kline [Fri, 8 Sep 2017 04:27:34 +0000 (04:27 +0000)]
Merge "Support NAT keepalives"
am:
6c7c55206d
Change-Id: Id241560fa48636f1bc56fa06d2151f1bcbdb19ab
Treehugger Robot [Fri, 8 Sep 2017 04:13:14 +0000 (04:13 +0000)]
Merge "Support NAT keepalives"
Erik Kline [Mon, 19 Jun 2017 02:33:59 +0000 (11:33 +0900)]
Support NAT keepalives
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- turned on debugging and walked around watching IpReachabilityMonitor
force neighbors into NUD_PROBE state without error
- observed NAT callbacks happening without any reported errors
- watched:
adb shell cat /proc/net/nf_conntrack | egrep '192[.]168[.]43[.]' | sort -n -k5
for correct timeout updates
Bug:
29337859
Bug:
32163131
Merged-In: I82ac60e5ad79ec64a13df6ec56b5b51b223f8dde
Merged-In: I09bc685e821ec5e871576a54c4290edea4c5160b
Merged-In: I4d180369a8f64ee494b016656988252d98a09ba4
Change-Id: Icb23da64cfaa3a19f7bc75fba426a52b0994fb0f
(cherry picked from commit
7a65bc62fbe0391f88834ab27b32033d6b957c8b)
Hugo Benichi [Fri, 8 Sep 2017 01:52:14 +0000 (01:52 +0000)]
Merge changes Ic92b6d5c,I98b23b22,I0fb40d7b am:
9c57accc45
am:
166413798d
Change-Id: I4203dc39e2f141c864949adb58a96fcca480a369
Hugo Benichi [Fri, 8 Sep 2017 01:42:28 +0000 (01:42 +0000)]
Merge changes Ic92b6d5c,I98b23b22,I0fb40d7b
am:
9c57accc45
Change-Id: Id1a9f8232ef3e08cf708d2406403fce3c59be9e5
Hugo Benichi [Fri, 8 Sep 2017 01:25:30 +0000 (01:25 +0000)]
Merge changes Ic92b6d5c,I98b23b22,I0fb40d7b
* changes:
IP metrics: update link layer mapping
IP connectivity metrics: fix tests after proto update
Connectivity metrics: update ipconnectivity.proto
Chen Xu [Thu, 7 Sep 2017 21:27:04 +0000 (21:27 +0000)]
Merge "Fix Crash CarrierDefaultApp due to exception" am:
0ec2348b85
am:
9d2c715d37
Change-Id: I638e568ed4c7b554cad141078f8546c7a35f2836
Chen Xu [Thu, 7 Sep 2017 21:15:36 +0000 (21:15 +0000)]
Merge "fix cellular captive portal reevaluation url" am:
88307143e0
am:
c0aea2f563
Change-Id: I1330ba47aaed7d3df0df80b3efc354b63cd9bdda
Chen Xu [Thu, 7 Sep 2017 21:09:54 +0000 (21:09 +0000)]
Merge "Fix Crash CarrierDefaultApp due to exception"
am:
0ec2348b85
Change-Id: I04f22351f158fb6db7ba62f680b8730fd8324f1f
Chen Xu [Thu, 7 Sep 2017 21:00:50 +0000 (21:00 +0000)]
Merge "fix cellular captive portal reevaluation url"
am:
88307143e0
Change-Id: I22c921fde0abb5993d1ddb3bb3660b07a72326d3
Chen Xu [Thu, 7 Sep 2017 20:59:03 +0000 (20:59 +0000)]
Merge "Fix Crash CarrierDefaultApp due to exception"
Chen Xu [Thu, 7 Sep 2017 20:46:50 +0000 (20:46 +0000)]
Merge "fix cellular captive portal reevaluation url"
fionaxu [Mon, 10 Jul 2017 16:34:07 +0000 (09:34 -0700)]
fix cellular captive portal reevaluation url
we apply redirection link as the url everywhere for cellular captive portal.
this url should only be used when load the portal page at the first place (when users
click on the notification) and shouldn't be used as the re-evaluation url
as it wont return the expected response code.
instead we should use special URL (generate_204) from connectivity
service which will return 204 if redirection is gone.
Test: manual test with cold and hot TMO SIM
Bug:
62532802
Change-Id: I56bb03a58447c5c46758e692ff357d540ea4cd7b
Hugo Benichi [Tue, 18 Jul 2017 02:35:18 +0000 (11:35 +0900)]
IP metrics: update link layer mapping
Properly map transport nan and lowpan to their corresponding link layer
enum. Also do so for interface names
Bug:
34901696
Bug:
65439160
Test: runtest frameworks-net
Merged-In: I44a1cb3b6d21881b64adda7744360e4dfc519b12
(cherry picked from commit
f7f7ed013ca7641c784b81ef685bd84c4c45cfbb)
Change-Id: Ic92b6d5c07404ea79f9a8975e8fc6925eaa10ba4
Hugo Benichi [Tue, 18 Jul 2017 05:28:27 +0000 (14:28 +0900)]
IP connectivity metrics: fix tests after proto update
Update to ipconnectivity.proto in commit
6d2f506bfd788a3685292d404dc9d82a27357cfe broke the associated unit
tests (Change-Id: I4cf5b95956df721aecd63fddfb026a7266c190b9)
Bug:
34901696
Bug:
65439160
Test: runtest frameworks-net
Merged-In: I57a6bad8a9836b1c45690c4589b416786ce1dfa0
(cherry picked from commit
822c5bf77892175d0b52aeaddf4e43c749c341f6)
Change-Id: I98b23b2208bbd7d12237fcb000f3cf10c53d9e55
Hugo Benichi [Tue, 20 Jun 2017 02:15:14 +0000 (11:15 +0900)]
Connectivity metrics: update ipconnectivity.proto
Bug:
34901696
Bug:
65439160
Test: $runtest frameworks-net
build, flashed, booted phone, $ adb shell dumpsys connmetrics list
Merged-In: I4cf5b95956df721aecd63fddfb026a7266c190b9
(cherry picked from commit
6d2f506bfd788a3685292d404dc9d82a27357cfe)
Change-Id: I0fb40d7b644786efc839468b2d7e1cfcedd71ad8
Rubin Xu [Thu, 7 Sep 2017 12:38:56 +0000 (12:38 +0000)]
Merge "Always add local subnet routes to the interface's routing table" am:
981228be38
am:
5fb26a1270
Change-Id: I3e0aa03b46b77bd65aa301fec28f4f6ab5de5c62
Rubin Xu [Thu, 7 Sep 2017 12:25:05 +0000 (12:25 +0000)]
Merge "Always add local subnet routes to the interface's routing table"
am:
981228be38
Change-Id: I0b1728fae18c891d91fafdfbb1905c05e0fea47f
Rubin Xu [Thu, 7 Sep 2017 12:12:09 +0000 (12:12 +0000)]
Merge "Always add local subnet routes to the interface's routing table"
Kensuke Matsui [Wed, 5 Jul 2017 05:53:05 +0000 (14:53 +0900)]
Avoid race condition during grayscale animation of QS tile
DrawableIcon returns the same instance of its Drawable
for both getDrawable() and getInvisibleDrawable().
This could cause a race condition during grayscale animation
of a QS tile which uses the same icon for both ON and OFF state.
Clone the original Drawable and use it for invisible drawable
to solve this.
Fixes:
65437135
Test: manual - put a custom tile at the first position of QS panel
and tap it
Change-Id: Ie74edd9c5e58118a70b5abd8096cdd1297940ef5
Rubin Xu [Tue, 5 Sep 2017 17:40:49 +0000 (18:40 +0100)]
Always add local subnet routes to the interface's routing table
For some networks such as mobile data connections, its LinkProperties
does not contain routes for the local subnet so no such route is added
to the interface's routing table. This can be problematic especially
if the device is in VPN lockdown mode where there exists high-priority
PROHIBIT routing rule which in turn blocks the network's default gateway
route from being added (next hop address hitting the prohibit rule).
We fix this by patching LinkProperties to always include direct connected routes
when they are received by ConnectivityService. This has the added advantage that
when apps get LinkProperties, they see the directly connected routes as well.
Bug:
63662962
Test: runtest frameworks-core -c android.net.LinkPropertiesTest
Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest
Test: Start with device with mobile data, set up ics-OpenVPN in always-on
lockdown mode. Turn off mobile data then turn it back on, observe
mobile data connectivity is restored and VPN successfully reconnects.
Change-Id: I35b614eebccfd22c4a5270f40256f9be1e25abfb
fionaxu [Thu, 7 Sep 2017 08:15:48 +0000 (08:15 +0000)]
resolve merge conflicts of
6c7ef2e8d753 to stage-aosp-master
am:
619e5c8ecc
Change-Id: Id0a086a966c121fa850bb1c8748f1565ef6d1b82
fionaxu [Thu, 7 Sep 2017 05:57:32 +0000 (22:57 -0700)]
resolve merge conflicts of
6c7ef2e8d753 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Change-Id: I6a3488f21412b17e9a6bb453bd4137abab3ae205
Qiongcheng Luo [Fri, 4 Aug 2017 06:34:34 +0000 (14:34 +0800)]
Fix Crash CarrierDefaultApp due to exception
[Issue]
CarrierDefaultApp crashes due to null pointer exception.
[Cause of defect]
To call mUrl.toString() even if mUrl is null and mUrl is already
checked if it is null just before.
[How to fix]
Check the null status of mUrl when call its toString() method.
Bug:
65393337
Change-Id: I4b4b1f125aac7e30ca18be22d7adc358cab83b2f
Sujith Ramakrishnan [Thu, 7 Sep 2017 02:12:29 +0000 (02:12 +0000)]
Merge "Make ASSIST launch VIS and add a keycode for TV (ALL_APPS)" into oc-dev am:
c07c23b1f7 -s ours
am:
1255f26551
Change-Id: If99689b79fa86283bf198412ef506c91d3ffb1ab
Sujith Ramakrishnan [Thu, 7 Sep 2017 01:59:58 +0000 (01:59 +0000)]
Merge "Make ASSIST launch VIS and add a keycode for TV (ALL_APPS)" into oc-dev
am:
c07c23b1f7 -s ours
Change-Id: I87c316c7b1738e9a85b867088a074536bc5e9db1
Sujith Ramakrishnan [Thu, 7 Sep 2017 00:09:21 +0000 (00:09 +0000)]
Merge "Make ASSIST launch VIS and add a keycode for TV (ALL_APPS)" into oc-dev
Treehugger Robot [Wed, 6 Sep 2017 23:53:48 +0000 (23:53 +0000)]
Merge "disable carrier actions on redirection by default"
fionaxu [Wed, 6 Sep 2017 21:19:16 +0000 (14:19 -0700)]
disable carrier actions on redirection by default
1. the assumption of "carrier will redirect users to their captive
portal page when users dont have data plan" might not be true for all
carriers. We have seem issues like carriers random redirect users when
they still have balance left.
2. turn this off by default and turn it on if the carrier is
behaving correctly and agree with it.
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Bug:
65113738
Test: Manual
Change-Id: I60be2de3aa227298e60ea7eb9535bad8967b1fe3
Adam Lesinski [Wed, 6 Sep 2017 20:58:32 +0000 (20:58 +0000)]
Merge "idmap: include idmap version in check for stale file" am:
609887a980
am:
a15992086c
Change-Id: Ib8510f7a156ef71926b1e3f339aa4426981d4745
Adam Lesinski [Wed, 6 Sep 2017 20:36:28 +0000 (20:36 +0000)]
Merge "idmap: include idmap version in check for stale file"
am:
609887a980
Change-Id: I4779cd92041fe33a95c0034c539c48989ca8e6df
Mårten Kongstad [Wed, 6 Sep 2017 20:25:27 +0000 (20:25 +0000)]
Merge "idmap: suppress print for padded resources" am:
3949701c6f
am:
4f4218a3be
Change-Id: I5f2d47c217152d47743b72e6082abf625d2425f8
Mårten Kongstad [Wed, 6 Sep 2017 20:04:35 +0000 (20:04 +0000)]
Merge "idmap: suppress print for padded resources"
am:
3949701c6f
Change-Id: I5d92bdc11172159ea8ad95614e2b4d4535a48e45
Adam Lesinski [Wed, 6 Sep 2017 19:44:26 +0000 (19:44 +0000)]
Merge "idmap: include idmap version in check for stale file"
Treehugger Robot [Wed, 6 Sep 2017 19:41:01 +0000 (19:41 +0000)]
Merge "idmap: suppress print for padded resources"
Bill Yi [Wed, 6 Sep 2017 19:13:07 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
b1d8caa355 -s ours
Change-Id: I61f891e2212e45fdeedc0daea7e620d812874d50
Android Build Merger (Role) [Wed, 6 Sep 2017 19:10:07 +0000 (19:10 +0000)]
Merge "Merge "Fix intermittent build failures with droiddoc generated sources" am:
a11709b185 am:
044ddc2352" into oc-dr1-dev-plus-aosp
Colin Cross [Wed, 6 Sep 2017 19:05:24 +0000 (19:05 +0000)]
Merge "Fix intermittent build failures with droiddoc generated sources" am:
a11709b185
am:
044ddc2352
Change-Id: I8927f668751cd35d2445d281105417959202db54
Bill Yi [Wed, 6 Sep 2017 19:02:45 +0000 (19:02 +0000)]
Import translations. DO NOT MERGE
am:
2c1d066618 -s ours
Change-Id: I96437ca46f0e27919860248bde6b9f260c65079a
TreeHugger Robot [Wed, 6 Sep 2017 19:00:00 +0000 (19:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Colin Cross [Wed, 6 Sep 2017 18:47:58 +0000 (18:47 +0000)]
Merge "Fix intermittent build failures with droiddoc generated sources"
am:
a11709b185
Change-Id: I7c6c2dc0fcb50387df07760e913f8f6841bc02bc
Colin Cross [Wed, 6 Sep 2017 18:34:47 +0000 (18:34 +0000)]
Merge "Fix intermittent build failures with droiddoc generated sources"
Colin Cross [Wed, 6 Sep 2017 05:59:27 +0000 (22:59 -0700)]
Fix intermittent build failures with droiddoc generated sources
Jack builds fail very rarely with missing droiddoc generated
source files. This happens because jack builds have an extra
rule that does a quick check of the sources and touches a
jack.check.timestamp file. The manual dependencies for the
generated sources didn't cover this case. If the sources are
partially generated when the jack.check.timestamp rule runs,
the rule can see partial sources and fail. The same problem
might also happen for javac builds after
https://android-review.googlesource.com/c/platform/build/+/404743
separated the source list generation rule out of the
$(full_classes_jar) rule.
Use LOCAL_ADDITIONAL_DEPENDENCIES instead, which covers these
cases and will be updated to cover future changes.
Bug:
65255877
Test: m -j ANDROID_COMPILE_WITH_JACK=true out/target/common/obj/JAVA_LIBRARIES/android.test.runner.stubs_intermediates/jack.check.timestamp
make sure sources are generated
Change-Id: I4466b3128eb0bba6447c24abf921a6655a3d451f
Merged-In: I4466b3128eb0bba6447c24abf921a6655a3d451f
(cherry picked from commit
85ab406eb2abd2e98fa9a67384223592692c08a9)
Jiyong Park [Wed, 6 Sep 2017 16:15:00 +0000 (16:15 +0000)]
Merge "Separate GraphicsEnv from libui" am:
fb5369bc3f
am:
576305e29c
Change-Id: I050d101ae009c98dfb4216cc9bdf49ce8c6a61aa
Jiyong Park [Wed, 6 Sep 2017 16:03:32 +0000 (16:03 +0000)]
Merge "Separate GraphicsEnv from libui"
am:
fb5369bc3f
Change-Id: I7d1fbc70ef0b4273390ce15ae0b36553ef08220d
Treehugger Robot [Wed, 6 Sep 2017 15:53:00 +0000 (15:53 +0000)]
Merge "Separate GraphicsEnv from libui"
Kensuke Matsui [Wed, 6 Sep 2017 15:26:36 +0000 (15:26 +0000)]
Merge "Fix NPE in StatusBar#onBackPressed()" am:
6cfa7f2fee
am:
10379e1f17
Change-Id: Ie4db309fc0c75b0e5c9195cf1797abffd2c8a58c
Kensuke Matsui [Wed, 6 Sep 2017 15:17:05 +0000 (15:17 +0000)]
Merge "Fix NPE in StatusBar#onBackPressed()"
am:
6cfa7f2fee
Change-Id: Ic29857e67231ff109535adf18882b869d7ce6af1
Treehugger Robot [Wed, 6 Sep 2017 15:10:18 +0000 (15:10 +0000)]
Merge "Fix NPE in StatusBar#onBackPressed()"
Bill Yi [Wed, 6 Sep 2017 13:57:50 +0000 (06:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I1f5a8fdd408de1a74689fe6e1de0422529d797d8
Kensuke Matsui [Fri, 21 Jul 2017 08:35:10 +0000 (17:35 +0900)]
Fix NPE in StatusBar#onBackPressed()
StatusBar.mKeyguardUserSwitcher is instantiated
only if multi user function is enabled.
But mKeyguardUserSwitcher.hideIfNotSimple() is invoked
without null check in StatusBar#onBackPressed().
This causes NPE on multi user disabled devices.
Fixes:
65391930
Test: manual - tap Back key on lockscreen
Change-Id: I528823fa832ee5096d73dea660997fc276d86c5c
Bill Yi [Wed, 6 Sep 2017 05:31:46 +0000 (22:31 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I409427c1b5e9b8b3e29947002e8bc6d5985bec77
Jack He [Wed, 6 Sep 2017 00:39:55 +0000 (00:39 +0000)]
Merge "Bluetooth: Thread-safe binder invocation" am:
94f1fd0da2
am:
a672ffa42f
Change-Id: If02485ca3e3c16da3bc58532604576d577684528
Jack He [Wed, 6 Sep 2017 00:30:09 +0000 (00:30 +0000)]
Merge "Bluetooth: Thread-safe binder invocation"
am:
94f1fd0da2
Change-Id: I8f9c76996f02c70b8d2ea21d4eb567eaa9da246a
Vinay Kalia [Wed, 6 Sep 2017 00:21:37 +0000 (00:21 +0000)]
Merge "Update documentation for startScan" am:
7d2219d170
am:
04d061e891
Change-Id: Ib88766933fef830d2613b9b92bc744aed75c6e9f
Treehugger Robot [Wed, 6 Sep 2017 00:10:55 +0000 (00:10 +0000)]
Merge "Bluetooth: Thread-safe binder invocation"
Jack He [Thu, 17 Aug 2017 19:11:18 +0000 (12:11 -0700)]
Bluetooth: Thread-safe binder invocation
* Binder object may become null between null check and actual invocation
if using a instance private variable assignable by service connection
callbacks
* The solution to this problem without locking is to assign existing
binder variable to a local final variable before the null check
* Any further invocation to a disconnected binder object will result in
RemoteException that is caught by the try-catch block
* Read and write to volatile variable is always atomic and hence thread-safe
* Removed unnecessary synchronization in BluetoothAdapter constructor
* Private mConnection objects should be final
* Simplfied several return statements where booleans can be returned
directly
* Removed unnecessary catches for NPE since there won't be any
Bug:
64724692
Test: make, pair and use devices, no functional change
Change-Id: Ifc9d6337c0d451a01484b61243230725d5314f8e
Vinay Kalia [Wed, 6 Sep 2017 00:08:24 +0000 (00:08 +0000)]
Merge "Update documentation for startScan"
am:
7d2219d170
Change-Id: I5ea7a5a9b0a69168a1715986e4850276299af78a
Treehugger Robot [Tue, 5 Sep 2017 23:50:24 +0000 (23:50 +0000)]
Merge "Update documentation for startScan"
Jiyong Park [Mon, 8 May 2017 04:29:35 +0000 (13:29 +0900)]
Separate GraphicsEnv from libui
GraphicsEnv class is separated from libui and became a standalone lib
'libgraphicsenv'.
Bug:
38097618
Test: sailfish builds and boots
Change-Id: I7a5c273ba9238c3a6c90e1de80b9e97fc0772188
Yifan Hong [Tue, 5 Sep 2017 22:09:10 +0000 (22:09 +0000)]
Merge "Fix ownership of objects returned by VintfObject::Get*" am:
2cdd1ce600
am:
56d8c8297d
Change-Id: Ie1686b277b02886a56a22e5925671adce651a6e4
Yifan Hong [Tue, 5 Sep 2017 21:53:40 +0000 (21:53 +0000)]
Merge "Fix ownership of objects returned by VintfObject::Get*"
am:
2cdd1ce600
Change-Id: I770ff369d16000d7f1eed8a4472e57cbc9b1b99c
Yifan Hong [Tue, 5 Sep 2017 21:45:13 +0000 (21:45 +0000)]
Merge "Fix ownership of objects returned by VintfObject::Get*"
Julius D'souza [Tue, 5 Sep 2017 21:06:32 +0000 (21:06 +0000)]
DO NOT MERGE: Dynamic doze check should be required before adjusting sensor rate. am:
1f3da1c8b9 -s ours am:
c7088d8bf8 -s ours am:
ef6e002b30
am:
44bdde7bd1
Change-Id: I4d0e38278fdbd4abb85e5caf87d94880d558843c
Julius D'souza [Tue, 5 Sep 2017 20:54:13 +0000 (20:54 +0000)]
DO NOT MERGE: Dynamic doze check should be required before adjusting sensor rate. am:
1f3da1c8b9 -s ours am:
c7088d8bf8 -s ours
am:
ef6e002b30
Change-Id: Ie9aabc371ae2bad03bfced07acce9502d6c897ee
Vinay Kalia [Tue, 5 Sep 2017 20:51:58 +0000 (13:51 -0700)]
Update ScanSettings documentation for scan modes
SCAN_MODE_LOW_POWER is enforced for applications running
in background.
Test: BLE scanning applications.
BUG:
38198694
BUG:
62491228
Change-Id: Ib2b6c297298e05f1b088411e94cfe4789dde0821
Julius D'souza [Tue, 5 Sep 2017 20:43:31 +0000 (20:43 +0000)]
DO NOT MERGE: Dynamic doze check should be required before adjusting sensor rate. am:
1f3da1c8b9 -s ours
am:
c7088d8bf8 -s ours
Change-Id: I6cbd05dcb09b013e17f5c26c1fa24a656c7b8316
Pankaj Kanwar [Tue, 5 Sep 2017 20:34:35 +0000 (20:34 +0000)]
Merge "Remove config_tether_apndata for Telstra." into oc-dr1-dev
am:
e424d123ab
Change-Id: Idcf5859f14ca7713d1629467fc33c4584b2a8d2b
Pankaj Kanwar [Tue, 5 Sep 2017 20:25:36 +0000 (20:25 +0000)]
Merge "Remove config_tether_apndata for Telstra." into oc-dr1-dev
Julius D'souza [Tue, 5 Sep 2017 20:23:44 +0000 (20:23 +0000)]
DO NOT MERGE: Dynamic doze check should be required before adjusting sensor rate.
am:
1f3da1c8b9 -s ours
Change-Id: Ib94052397392808af53de5c6f265a0cd29950b4e
Vinay Kalia [Fri, 1 Sep 2017 19:18:10 +0000 (12:18 -0700)]
Update documentation for startScan
With change c4a1e1, unfiltered BLE scans are stopped on screen off
and resumed when screen is turned back on. This is done to save power.
This change updates the documentation accordingly.
BUG:
62264269
Test: Documentation update.
Change-Id: I2d8e9f9f122f978c4d4f59d4139cb51cd4e4a123
Felipe Leme [Thu, 31 Aug 2017 19:37:33 +0000 (12:37 -0700)]
Javadoc: Added alternative to Package verification.
Bug:
64125551
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML
Change-Id: I371cd1752ab92e19461fe3bf3d034c7bc83ca2dd
Julius D'souza [Tue, 5 Sep 2017 17:17:06 +0000 (10:17 -0700)]
DO NOT MERGE: Dynamic doze check should be required before adjusting sensor rate.
Some devices have catastrophic firmware issues in switching the sensor rate;
for these devices, the sensor rate switch should be skipped entirely.
Change-Id: I04fc3d27c99f95b33f86f012a8d398f817f7713a