OSDN Git Service
Eric Laurent [Fri, 24 Feb 2017 19:49:55 +0000 (19:49 +0000)]
Merge "Load hyphenation patterns for Bulgarian and Church Slavonic" am:
70bc4a8036
am:
330ac1223a
Change-Id: I23f1e0cf7938afbf18611191f12f68779b7c017e
Eric Laurent [Fri, 24 Feb 2017 19:45:28 +0000 (19:45 +0000)]
Merge "Load hyphenation patterns for Bulgarian and Church Slavonic"
am:
70bc4a8036
Change-Id: Iac325d28a09f4ddceb93ec85beba0eabfd393992
Eric Laurent [Fri, 24 Feb 2017 19:36:28 +0000 (19:36 +0000)]
Merge "Load hyphenation patterns for Bulgarian and Church Slavonic"
Mukesh Agrawal [Fri, 24 Feb 2017 19:36:23 +0000 (19:36 +0000)]
Merge "StateMachine: add getLogRecMaxSize()" am:
22e43471ed
am:
0a2d5cf7db
Change-Id: Id8a21420d17074e7331f8f67453fe09c338991ec
Mukesh Agrawal [Fri, 24 Feb 2017 19:32:03 +0000 (19:32 +0000)]
Merge "StateMachine: add getLogRecMaxSize()"
am:
22e43471ed
Change-Id: Iaab7955c0721e240487e8c842e994c90141d6013
Mukesh Agrawal [Fri, 24 Feb 2017 19:26:47 +0000 (19:26 +0000)]
Merge "StateMachine: add getLogRecMaxSize()"
Roozbeh Pournader [Thu, 23 Feb 2017 02:53:39 +0000 (18:53 -0800)]
Load hyphenation patterns for Bulgarian and Church Slavonic
Patterns for Bulgarian (bg) and Church Slavonic (cu) are now loaded
too.
Also make changes to fontchain_lint.py, so it knows the script for Bulgarian
and Church Slavonic is Cyrillic.
Test: make -j works and creates .hyb files for bg and cu
Change-Id: I0586f6c49380279ef88fe952b5cfd2d3594c5524
Alex Light [Fri, 24 Feb 2017 18:43:56 +0000 (18:43 +0000)]
Merge "Update api for InMemoryDexClassLoader" am:
2f40b2b302
am:
c878255b5f
Change-Id: Ifaf686ab006aee45447b3fb7c7da97f1a079dffd
Alex Light [Fri, 24 Feb 2017 18:39:00 +0000 (18:39 +0000)]
Merge "Update api for InMemoryDexClassLoader"
am:
2f40b2b302
Change-Id: I4c28a97869d17862076521c7fc22a96f9946d6b0
Treehugger Robot [Fri, 24 Feb 2017 18:32:21 +0000 (18:32 +0000)]
Merge "Update api for InMemoryDexClassLoader"
Alex Light [Fri, 24 Feb 2017 16:22:13 +0000 (08:22 -0800)]
Update api for InMemoryDexClassLoader
We changed the base class for InMemoryDexClassLoader to be
BaseDexClassLoader.
Test: m -j40 droid
Change-Id: Ibf9f8996a8b9a2feebbd42ec864fd1b08027a6ab
Jason Monk [Fri, 24 Feb 2017 15:22:39 +0000 (15:22 +0000)]
resolve merge conflicts of
1723bc14ebfd to stage-aosp-master
am:
4f458421b1
Change-Id: I5c2b3fb86d1b6629f407df8fb607de639d972260
Jason Monk [Fri, 24 Feb 2017 14:34:42 +0000 (09:34 -0500)]
resolve merge conflicts of
1723bc14ebfd to stage-aosp-master
Change-Id: I11054806dbd263b2adaedb21458c33b7407bb7d6
Jason Monk [Fri, 24 Feb 2017 14:13:59 +0000 (14:13 +0000)]
Merge "Data activity icon in statusbar"
Erik Kline [Fri, 24 Feb 2017 08:19:45 +0000 (08:19 +0000)]
Merge "Update UpstreamNetworkMonitor to use custom Handlers" am:
35c89886c2
am:
279a4feb72
Change-Id: I7f9e1a775e08363d9006f1dbb7af61d0d8e41043
Erik Kline [Fri, 24 Feb 2017 08:15:19 +0000 (08:15 +0000)]
Merge "Update UpstreamNetworkMonitor to use custom Handlers"
am:
35c89886c2
Change-Id: I76433822a9b7c124e4b7cfcf2a20cb0e43a60199
Erik Kline [Fri, 24 Feb 2017 08:06:16 +0000 (08:06 +0000)]
Merge "Update UpstreamNetworkMonitor to use custom Handlers"
Miao Wang [Fri, 24 Feb 2017 05:52:14 +0000 (05:52 +0000)]
Merge "Update RenderScript JNI code for Treble" am:
9017b25631
am:
76535e8888
Change-Id: I04dc6154e0c919a2a2c2c150b6877538b4e8da0a
Miao Wang [Fri, 24 Feb 2017 05:47:35 +0000 (05:47 +0000)]
Merge "Update RenderScript JNI code for Treble"
am:
9017b25631
Change-Id: I0cc281a372ec83d3731a83b0af5cc3a02b259a67
Miao Wang [Fri, 24 Feb 2017 05:39:14 +0000 (05:39 +0000)]
Merge "Update RenderScript JNI code for Treble"
Erik Kline [Wed, 22 Feb 2017 03:58:24 +0000 (12:58 +0900)]
Update UpstreamNetworkMonitor to use custom Handlers
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32130437
Bug:
32163131
Change-Id: I2bc3f87cdf7fa6392b4750eb8adb4ea33c6a3f43
Miao Wang [Wed, 25 Jan 2017 02:58:17 +0000 (18:58 -0800)]
Update RenderScript JNI code for Treble
- Include rsApiStubs.h instead of rs.h, and remove unused
dependencies for rs.h in Android.mk.
- Remove libRSDriver.so from LOCAL_REQUIRED_MODULE, since it is not
required nor directly used by librs_jni.so.
- Fix the discrepancy in ElementGetNativeData and
ElementGetSubElements, respective to NDK APIs exposed in libRS.so.
rsApiStubs.h contains all public RenderScript APIs exposed in libRS.so.
It fixes the mismatch of the declarations and definitions of the two
functions mentioned above. And it does not rely on the auto generated
header (rsgApiFuncDecl.h) anymore.
Bug:
34396220
Test: mm
Merged-In: Iedb1b976cfa9033dccefe78cbe80c8022f990e53
Change-Id: Iedb1b976cfa9033dccefe78cbe80c8022f990e53
Chen Xu [Fri, 24 Feb 2017 02:38:56 +0000 (02:38 +0000)]
Merge "renaming telephony internal hidden intents" am:
6d198966fe
am:
3b7643ceed
Change-Id: I4b544145c59c7ba73a0187d320e01c56f9b63fe9
Chen Xu [Fri, 24 Feb 2017 02:33:53 +0000 (02:33 +0000)]
Merge "renaming telephony internal hidden intents"
am:
6d198966fe
Change-Id: If1db829fe5308bcbc1d8b778aef50368581850f4
Chen Xu [Fri, 24 Feb 2017 02:24:42 +0000 (02:24 +0000)]
Merge "renaming telephony internal hidden intents"
fionaxu [Fri, 24 Feb 2017 02:06:52 +0000 (18:06 -0800)]
renaming telephony internal hidden intents
The "android.*" namespace for intent constants is reserved for public
Android API in AOSP. (Whether public to the full SDK, @SystemApi or
defined in AOSP support libraries.) Implementation details of AOSP
components (subject to change by OEMs at will) should use the
"com.android.internal.*" as per CDD
Bug:
33679454
Test: manual
Change-Id: I7183493e2794a82e023bc4993aee328f24b2e7cb
mukesh agrawal [Fri, 24 Feb 2017 01:13:29 +0000 (17:13 -0800)]
StateMachine: add getLogRecMaxSize()
Add the getLogRecMaxSize() method, so that
WifiStateMachine tests can verify the log
record buffer size, without having to fill
the buffer.
Bug:
35399013
Test: compile
Change-Id: Ib1bd8d670b7b39e9f740a4dd92ea67463b179ce2
Dimitry Ivanov [Thu, 23 Feb 2017 23:36:40 +0000 (23:36 +0000)]
Merge "Add isBundled argument to LoadedApk.makePaths call" am:
0743d56e2b
am:
029170ee2b
Change-Id: Ia566854612ea9c9570fb8d7b6adc1a0e1e074d02
Dimitry Ivanov [Thu, 23 Feb 2017 23:30:16 +0000 (23:30 +0000)]
Merge "Add isBundled argument to LoadedApk.makePaths call"
am:
0743d56e2b
Change-Id: I74deae8126109555bbbe57983ffd6a22ab50e303
Treehugger Robot [Thu, 23 Feb 2017 23:21:09 +0000 (23:21 +0000)]
Merge "Add isBundled argument to LoadedApk.makePaths call"
Abhishek Adappa [Thu, 23 Feb 2017 22:27:07 +0000 (22:27 +0000)]
Merge "Add a new ImsReasonInfo code" am:
b4234e6af8
am:
bb59947d90
Change-Id: I06bd38225b0fcbd8619a5b5eb7d827cfba1c0cb0
Abhishek Adappa [Thu, 23 Feb 2017 22:22:40 +0000 (22:22 +0000)]
Merge "Add a new ImsReasonInfo code"
am:
b4234e6af8
Change-Id: Ia5174fafbc08acf559e35a28538d2b112b5cdb19
Dimitry Ivanov [Wed, 22 Feb 2017 23:39:42 +0000 (15:39 -0800)]
Add isBundled argument to LoadedApk.makePaths call
There is a disconnect between the way webview created
classloader and the way makePaths decides if paths are
intended for bundled app.
This change moves decision making out of makePaths method
which allows WebViewZygote to pass correct argument and
have makePath omit java.library.path for libPaths
Bug: http://b/
35426785
Test: manual
Change-Id: Iab5a18c0091d0193dafa750498eb00f378411ba0
(cherry picked from commit
638d81009918eae44eec3261e235b78eae44331d)
Treehugger Robot [Thu, 23 Feb 2017 22:14:20 +0000 (22:14 +0000)]
Merge "Add a new ImsReasonInfo code"
Rebecca Silberstein [Thu, 23 Feb 2017 21:52:34 +0000 (21:52 +0000)]
Merge "wifi.proto: add SoftApReturnCode enum" am:
84374678e0
am:
e1dd7de75e
Change-Id: I9d3b69543b45dbf797d5fee0f8de51966ca4dacb
Rebecca Silberstein [Thu, 23 Feb 2017 21:46:51 +0000 (21:46 +0000)]
Merge "wifi.proto: add SoftApReturnCode enum"
am:
84374678e0
Change-Id: I22d8aca86a5a5c28c393db372b4399e5ddd99f46
Rebecca Silberstein [Thu, 23 Feb 2017 21:29:02 +0000 (21:29 +0000)]
Merge "wifi.proto: add SoftApReturnCode enum"
Paul Lawrence [Thu, 23 Feb 2017 20:46:41 +0000 (20:46 +0000)]
Merge "Use bionic's autogenerated whitelist policy" am:
dcd14de5f6
am:
82c92f94bf
Change-Id: I2995ab46372e10db9f879c359ead1ccbef9b45ae
Paul Lawrence [Thu, 23 Feb 2017 20:41:33 +0000 (20:41 +0000)]
Merge "Use bionic's autogenerated whitelist policy"
am:
dcd14de5f6
Change-Id: Idf1ab0f6a2028a1e41c52f6269ec05a9f1e87ec5
Amin Shaikh [Thu, 23 Feb 2017 20:41:12 +0000 (20:41 +0000)]
Merge changes from topic 'disabled-reason' am:
d0fc3f1383
am:
b858ffbe42
Change-Id: I5138cd1713ccecac8fa304275aec88734c040ffb
Amin Shaikh [Thu, 23 Feb 2017 20:39:57 +0000 (20:39 +0000)]
Add a disabled reason for recommendation providers am:
a70bc57ef9
am:
df6f7b9388
Change-Id: Id69eccbba15a0eb20c48680204007ed5354bd734
Amin Shaikh [Thu, 23 Feb 2017 20:35:10 +0000 (20:35 +0000)]
Merge changes from topic 'disabled-reason'
am:
d0fc3f1383
Change-Id: I09e7dff673a56fb3c51cde827ae783da32407a70
Amin Shaikh [Thu, 23 Feb 2017 20:33:59 +0000 (20:33 +0000)]
Add a disabled reason for recommendation providers
am:
a70bc57ef9
Change-Id: Ie91764892f6bd8fc20990f5a172c020a670875ff
Treehugger Robot [Thu, 23 Feb 2017 20:27:45 +0000 (20:27 +0000)]
Merge "Use bionic's autogenerated whitelist policy"
Treehugger Robot [Thu, 23 Feb 2017 20:22:06 +0000 (20:22 +0000)]
Merge changes from topic 'disabled-reason'
* changes:
Fix failing WifiConfigManagerTest test.
Add a disabled reason for recommendation providers
Makoto Onuki [Thu, 23 Feb 2017 20:18:04 +0000 (20:18 +0000)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls am:
a08c6a1cfb am:
7c6b2f4d8b am:
f171c39e53 am:
89bb32fb0d
am:
3fe290622f
Change-Id: Ia96b9c9c7997c726da5ae0221bb4d2d41869deb2
Brad Ebinger [Thu, 23 Feb 2017 20:14:58 +0000 (20:14 +0000)]
Merge "reates base implementation of ImsService AIDLs" am:
b60869db12
am:
fe8d588dad
Change-Id: I3425819c9ca83577ea4946dae072d9816626d5e5
Makoto Onuki [Thu, 23 Feb 2017 20:12:53 +0000 (20:12 +0000)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls am:
a08c6a1cfb am:
7c6b2f4d8b am:
f171c39e53
am:
89bb32fb0d
Change-Id: I264cdae7f5db5e9b9ecb7ef93d60f977157e1512
Brad Ebinger [Thu, 23 Feb 2017 20:10:34 +0000 (20:10 +0000)]
Merge "reates base implementation of ImsService AIDLs"
am:
b60869db12
Change-Id: I6edf280213bee0756aad65148daafe3300849baa
Makoto Onuki [Thu, 23 Feb 2017 20:07:27 +0000 (20:07 +0000)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls am:
a08c6a1cfb am:
7c6b2f4d8b
am:
f171c39e53
Change-Id: I69a9ece7da697e2a2fb979febad1af352713ccbe
Makoto Onuki [Thu, 23 Feb 2017 20:03:59 +0000 (20:03 +0000)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls am:
a08c6a1cfb
am:
7c6b2f4d8b
Change-Id: I18c2b795270260a02a117351fe5ca3ce5a5c0467
Treehugger Robot [Thu, 23 Feb 2017 20:03:43 +0000 (20:03 +0000)]
Merge "reates base implementation of ImsService AIDLs"
Makoto Onuki [Thu, 23 Feb 2017 20:00:01 +0000 (20:00 +0000)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls
am:
a08c6a1cfb
Change-Id: I07ce253853c1b3066c81af4f52a4ff6968437ef4
Rebecca Silberstein [Tue, 24 Jan 2017 18:42:59 +0000 (10:42 -0800)]
wifi.proto: add SoftApReturnCode enum
SoftAp startup returns a failure mode if it does not start. This
additional information is useful in determining where we need to add
logging and retry logic to make SoftAp mode more reliable. The
combination of Failure + failure reason is mapped to an enum defined for
wifi metrics.
Bug:
30899122
Test: checked WifiMetricsProto.java for the enum
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: I944e3e249d3be5738352b26a1d12139fdd50bf80
Amin Shaikh [Thu, 23 Feb 2017 18:08:10 +0000 (10:08 -0800)]
Fix failing WifiConfigManagerTest test.
Bug:
35671673
Test: runtest frameworks-core frameworks-wifi
Change-Id: I55ff41464cabfb97d03a0758d73145df808ec2c8
Merged-In: I55ff41464cabfb97d03a0758d73145df808ec2c8
Paul Duffin [Thu, 23 Feb 2017 13:50:05 +0000 (13:50 +0000)]
Merge "Deprecate TestSuiteBuilder and related classes." am:
a26000b8f5
am:
fd61eb1e39
Change-Id: I23f137865997ca9ce4aa229c9329d8ea9fbcb6ee
Paul Duffin [Thu, 23 Feb 2017 13:49:07 +0000 (13:49 +0000)]
Merge "Fix build failure when using javac toolchain" am:
c098bea921
am:
5da6f4fbd1
Change-Id: I65623ab75b0cc7b828fe67544074549fc21206ca
Paul Duffin [Thu, 23 Feb 2017 13:44:24 +0000 (13:44 +0000)]
Merge "Deprecate TestSuiteBuilder and related classes."
am:
a26000b8f5
Change-Id: Ia9d491bd72f2a9f08838e298aaf4de5de28c7d4f
Paul Duffin [Thu, 23 Feb 2017 13:43:07 +0000 (13:43 +0000)]
Merge "Fix build failure when using javac toolchain"
am:
c098bea921
Change-Id: I56e965336c537295efc4c0c778f5c236f955bf10
Paul Duffin [Thu, 23 Feb 2017 13:36:30 +0000 (13:36 +0000)]
Merge "Deprecate TestSuiteBuilder and related classes."
Paul Duffin [Thu, 23 Feb 2017 13:34:38 +0000 (13:34 +0000)]
Merge "Fix build failure when using javac toolchain"
Makoto Onuki [Thu, 28 Jul 2016 20:10:42 +0000 (13:10 -0700)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls
Bug
30475753
Bug
35667752
Change-Id: I739ee7e259f041f5e133edf048b6b54cb7a770db
(cherry picked from commit
8198deacb52eb082ae9f0a5658d594dc9b689882)
Kenneth Westin [Thu, 28 Nov 2013 15:29:40 +0000 (16:29 +0100)]
Data activity icon in statusbar
Display data activity icon for Wi-Fi and mobile data
respectively in statusbar
Bug:
30849089
Test: manual - go to Settings > Developer options > Demo mode and then
enable both "Enable demo mode" and "Show demo mode"
Change-Id: I16e880ffb97666a6c6507b9cc8c99bf580972207
Abhishek Adappa [Wed, 11 Jan 2017 01:36:06 +0000 (17:36 -0800)]
Add a new ImsReasonInfo code
For IKEv2 authentication failure during ePDG tunnel establishment.
Test: make
Change-Id: I1d10efac806abfaa80d9875b908385f7732f293a
Chen Xu [Thu, 23 Feb 2017 02:08:33 +0000 (02:08 +0000)]
Merge "renaming telephony internal hidden intents" am:
09c663a84c
am:
979e4690ec
Change-Id: I8cce065cc9ce6a87fa0ce9753a5e9170da77da59
Chen Xu [Thu, 23 Feb 2017 02:03:00 +0000 (02:03 +0000)]
Merge "renaming telephony internal hidden intents"
am:
09c663a84c
Change-Id: Ic20ae9e6816d629c979859a7d18f1827bafcc034
Chen Xu [Thu, 23 Feb 2017 01:55:24 +0000 (01:55 +0000)]
Merge "renaming telephony internal hidden intents"
Brad Ebinger [Fri, 3 Feb 2017 00:21:22 +0000 (16:21 -0800)]
reates base implementation of ImsService AIDLs
This change introduces "base classes" of the AIDL interfaces that are
implemented in vendor provided ImsServices. This allows for new APIs
to be added to the AIDL files, along with stub implementation of those
AIDLs in the base classes. By extending from the base class, older
implementations of the AIDL interfaces will not need to be updated
when the interface changes.
This change also moves some of the com.android.ims classes from
frameworks/opt/net/ims to frameworks/base. Any class that will be
used in the new unbundled ImsService system will need to be in
the framework, as opposed to the optional library that they are
in now.
Bug:
30290416
Test: Manual
Change-Id: I4a186d8e910d6d4f711e983ec8d717fc5cbdefab
Brad Ebinger [Thu, 23 Feb 2017 00:57:23 +0000 (00:57 +0000)]
resolve merge conflicts of
ac9b2c4fab42 to stage-aosp-master
am:
4fb8988854
Change-Id: Ic679f452ad245cbe58ea8069c34c15e50ee9e5c2
Brad Ebinger [Thu, 23 Feb 2017 00:03:47 +0000 (16:03 -0800)]
resolve merge conflicts of
ac9b2c4fab42 to stage-aosp-master
Change-Id: I4a6094c41ab267f89a15c5e8caa25e6b683419d0
Brad Ebinger [Wed, 22 Feb 2017 23:22:06 +0000 (23:22 +0000)]
Merge "Add UI prompt for MMI code failure on 3gpp"
Amin Shaikh [Fri, 3 Feb 2017 01:50:12 +0000 (17:50 -0800)]
Add a disabled reason for recommendation providers
Display a message indicating that a saved networks has not been
automatically connecting due to low quality if
WifiConfiguration#mNotRecommended is set.
Bug:
34745259
Bug:
35671673
Test: m RunSettingsLibRoboTests && runtest frameworks-wifi
Change-Id: I275e2711da68715fb6d92bf954e9f58a3386b1f4
Merged-In: I275e2711da68715fb6d92bf954e9f58a3386b1f4
Calvin On [Wed, 22 Feb 2017 22:48:23 +0000 (22:48 +0000)]
Replace WearWifi/Cell services with WearConnectivityService am:
5555bccc70
am:
abfd5bccb9
Change-Id: If051c765d3ea81cce2bedc2dfa02d64744088054
Calvin On [Wed, 22 Feb 2017 22:41:41 +0000 (22:41 +0000)]
Replace WearWifi/Cell services with WearConnectivityService
am:
5555bccc70
Change-Id: I5d8c97b8d5c394aeae99b7ddbe0dfdd5706a4293
Hall Liu [Wed, 22 Feb 2017 19:00:55 +0000 (19:00 +0000)]
Merge "Introduce APIs for RTT calls (part 1)" am:
27ad05169e
am:
d83b06cd31
Change-Id: Id3608cf918d829ed785d7b75dffa6b6ce6990f34
Hall Liu [Wed, 22 Feb 2017 18:56:48 +0000 (18:56 +0000)]
Merge "Introduce APIs for RTT calls (part 1)"
am:
27ad05169e
Change-Id: I3fb3cb89b467e5df808967dcd478964a84e2e61f
Hall Liu [Wed, 22 Feb 2017 18:48:52 +0000 (18:48 +0000)]
Merge "Introduce APIs for RTT calls (part 1)"
Paul Duffin [Wed, 22 Feb 2017 15:27:51 +0000 (15:27 +0000)]
Merge "Remove conflicting package information for junit.runner and junit.textui" am:
f3f4775a35
am:
9b5522f8c4
Change-Id: I4925285c1ea3027d46ac396b8ea29ac44c075e0d
Paul Duffin [Wed, 22 Feb 2017 15:24:27 +0000 (15:24 +0000)]
Merge "Remove conflicting package information for junit.runner and junit.textui"
am:
f3f4775a35
Change-Id: Ie0ca0b2b6b5f06e90f55996625f758521c9039cb
Paul Duffin [Mon, 20 Feb 2017 16:26:09 +0000 (16:26 +0000)]
Deprecate TestSuiteBuilder and related classes.
Deprecates com.android.internal.util.Predicate in favour of
java.util.function.Predicate.
Deprecates TestMethod and TestSuiteBuilder in favour of
Android Test Support Library.
Bug:
35089332
Test: make checkbuild
Change-Id: Id8b2be55925d7ca09750fc9681817793517ceb5d
Treehugger Robot [Wed, 22 Feb 2017 15:15:33 +0000 (15:15 +0000)]
Merge "Remove conflicting package information for junit.runner and junit.textui"
Paul Duffin [Wed, 22 Feb 2017 11:42:46 +0000 (11:42 +0000)]
Fix build failure when using javac toolchain
The legacy-performance-test-hostdex library was built using the
BUILD_HOST_DALVIK_JAVA_LIBRARY macro (which creates a non-static
library) but is used with LOCAL_STATIC_JAVA_LIBRARIES which
requires a static library. That works with Jack but fails with
the javac toolchain.
This change switched to build legacy-performance-test-hostdex
using the BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY macro.
Bug:
30188076
Test: make checkbuild
Change-Id: I8d42c669e4ded3417ecdcb7b0251bc6346debd5d
Paul Duffin [Wed, 22 Feb 2017 12:43:57 +0000 (12:43 +0000)]
Remove conflicting package information for junit.runner and junit.textui
Removes package.html files and update package-info.java files to
use same wording as previous releases.
Bug:
35653948
Test: make docs
Change-Id: Idbede2eb4f57818f152834fad7e75dd181fe25d6
Daniel Nishi [Wed, 22 Feb 2017 04:04:38 +0000 (04:04 +0000)]
Don't crash when primary volume is null in AppCollector.
am:
d54f3a487b
Change-Id: I77e27f4a7e901e98995039bcfd68453bec83a6cd
Hugo Benichi [Wed, 22 Feb 2017 03:51:08 +0000 (03:51 +0000)]
Merge "ConnectivityManager: allow custom Handlers" am:
ef69246260
am:
cb47118af1
Change-Id: I04171173890b161c053c41a2a5c7e1602e510b8c
Hugo Benichi [Wed, 22 Feb 2017 03:48:10 +0000 (03:48 +0000)]
Merge "ConnectivityManager: allow custom Handlers"
am:
ef69246260
Change-Id: I8da5540f6561cdef4adc91bbeeb9c21a91c08d49
Hugo Benichi [Wed, 22 Feb 2017 03:42:14 +0000 (03:42 +0000)]
Merge "ConnectivityManager: allow custom Handlers"
Jack Yu [Wed, 22 Feb 2017 02:56:44 +0000 (02:56 +0000)]
Merge "Added telephony manager set sim power state API" am:
cbffe38631
am:
d1f5b4245f
Change-Id: I0db1ff82aa80b3719efa9c0bdc2ca0a6f39347a5
Jack Yu [Wed, 22 Feb 2017 02:50:29 +0000 (02:50 +0000)]
Merge "Added telephony manager set sim power state API"
am:
cbffe38631
Change-Id: I9fbe161505905c3d3c1c431d1589248324fb3e4f
Treehugger Robot [Wed, 22 Feb 2017 02:45:17 +0000 (02:45 +0000)]
Merge "Added telephony manager set sim power state API"
Jack Yu [Thu, 16 Feb 2017 23:31:59 +0000 (15:31 -0800)]
Added telephony manager set sim power state API
The new API can be used to power up/down the SIM. This is equivalent
to inserting and removing the card.
Test: Telephony sanity tests
bug:
32224755
Change-Id: Ib82ab1eff613946e7c31c9b2131183a40d09af80
Daniel Nishi [Wed, 22 Feb 2017 00:04:20 +0000 (16:04 -0800)]
Don't crash when primary volume is null in AppCollector.
getPrimaryStorageCurrentVolume() may return a null value. I did
not plan for this case in the AppCollector. This case occurs when
the primary storage is not mounted when the function is called.
By adding in a null check after getPrimaryStorageCurrentVolume()
and adding in preconditions to verify the non-nullness of the
volume as it propagates through the AppCollector, we ensure that
there should be no more NPE crashes for this reason.
Bug:
35636901
Test: FrameworkServicesTests
Change-Id: I4009e55502f71b8f14dd917ddd00caef3551aafd
Calvin On [Wed, 22 Feb 2017 00:41:43 +0000 (16:41 -0800)]
Replace WearWifi/Cell services with WearConnectivityService
go/wear-connectivity-service
Change-Id: I2a8214e2965ad63a23dc8c174db256a263102a6f
Hugo Benichi [Thu, 2 Feb 2017 08:02:36 +0000 (17:02 +0900)]
ConnectivityManager: allow custom Handlers
This patch adds overloaded version of registerDefaultNetworkCallback
registerNetworkCallback, and requestNetwork with an additional Handler
argument that is used for running the caller provided NetworkCallback.
It also clarifies the documentation of the existing methods that
implicitly uses the internal singleton ConnectivityThread about which
internal Handler is used for running NetworkCallbacks.
Test: build, flashed, booted device
Bug:
32130437
Change-Id: Iae15f81e47e2dc0355baf2f2c1679b77e56af299
Colin Cross [Tue, 21 Feb 2017 23:37:01 +0000 (23:37 +0000)]
Merge "Revert "Remove outdated emulator check which causes BT to not start"" am:
375ea2ae71
am:
ebc05de919
Change-Id: Id61ee53f3147d90d8fbca053633e3115b69d3065
Colin Cross [Tue, 21 Feb 2017 23:32:32 +0000 (23:32 +0000)]
Merge "Revert "Remove outdated emulator check which causes BT to not start""
am:
375ea2ae71
Change-Id: I3d5abc52abf3f7c01ba4fbee47d7e487e99f5dda
Hall Liu [Thu, 26 Jan 2017 01:12:49 +0000 (17:12 -0800)]
Introduce APIs for RTT calls (part 1)
Add signaling methods and data pipes for handling real-time text during
a call.
Change-Id: I876827c448252c5f786d7a4919c47891acb03877
Test: manual, through telecom testapps
Colin Cross [Tue, 21 Feb 2017 23:25:05 +0000 (23:25 +0000)]
Merge "Revert "Remove outdated emulator check which causes BT to not start""
Brad Ebinger [Tue, 21 Feb 2017 20:28:09 +0000 (20:28 +0000)]
Merge "Remove Session ID from ImsService APIs that do not need it." am:
975be6c065
am:
50bc658e20
Change-Id: I2b2e4b0cbfcee5dd19f6d79ce5a949ca61140ffb
Brad Ebinger [Tue, 21 Feb 2017 20:24:21 +0000 (20:24 +0000)]
Merge "Remove Session ID from ImsService APIs that do not need it."
am:
975be6c065
Change-Id: I09469d99bc68133a4de594507854c269e905c40e