Commit Graph

283697 Commits

Author SHA1 Message Date
Makoto Onuki
9bda68ffb7 DO NOT MERGE Relax isUserRunning check and allow in-profile calls am: a08c6a1cfb am: 7c6b2f4d8b am: f171c39e53 am: 89bb32fb0d
am: 3fe290622f

Change-Id: Ia96b9c9c7997c726da5ae0221bb4d2d41869deb2
2017-02-23 20:18:04 +00:00
Brad Ebinger
fe2a74bfee Merge "reates base implementation of ImsService AIDLs" am: b60869db12
am: fe8d588dad

Change-Id: I3425819c9ca83577ea4946dae072d9816626d5e5
2017-02-23 20:14:58 +00:00
Makoto Onuki
3fe290622f DO NOT MERGE Relax isUserRunning check and allow in-profile calls am: a08c6a1cfb am: 7c6b2f4d8b am: f171c39e53
am: 89bb32fb0d

Change-Id: I264cdae7f5db5e9b9ecb7ef93d60f977157e1512
2017-02-23 20:12:53 +00:00
Brad Ebinger
fe8d588dad Merge "reates base implementation of ImsService AIDLs"
am: b60869db12

Change-Id: I6edf280213bee0756aad65148daafe3300849baa
2017-02-23 20:10:34 +00:00
Makoto Onuki
89bb32fb0d DO NOT MERGE Relax isUserRunning check and allow in-profile calls am: a08c6a1cfb am: 7c6b2f4d8b
am: f171c39e53

Change-Id: I69a9ece7da697e2a2fb979febad1af352713ccbe
2017-02-23 20:07:27 +00:00
Makoto Onuki
f171c39e53 DO NOT MERGE Relax isUserRunning check and allow in-profile calls am: a08c6a1cfb
am: 7c6b2f4d8b

Change-Id: I18c2b795270260a02a117351fe5ca3ce5a5c0467
2017-02-23 20:03:59 +00:00
Treehugger Robot
b60869db12 Merge "reates base implementation of ImsService AIDLs" 2017-02-23 20:03:43 +00:00
Makoto Onuki
7c6b2f4d8b DO NOT MERGE Relax isUserRunning check and allow in-profile calls
am: a08c6a1cfb

Change-Id: I07ce253853c1b3066c81af4f52a4ff6968437ef4
2017-02-23 20:00:01 +00:00
Paul Duffin
9dcdc8f187 Merge "Deprecate TestSuiteBuilder and related classes." am: a26000b8f5
am: fd61eb1e39

Change-Id: I23f137865997ca9ce4aa229c9329d8ea9fbcb6ee
2017-02-23 13:50:05 +00:00
Paul Duffin
df8bb0ec52 Merge "Fix build failure when using javac toolchain" am: c098bea921
am: 5da6f4fbd1

Change-Id: I65623ab75b0cc7b828fe67544074549fc21206ca
2017-02-23 13:49:07 +00:00
Paul Duffin
fd61eb1e39 Merge "Deprecate TestSuiteBuilder and related classes."
am: a26000b8f5

Change-Id: Ia9d491bd72f2a9f08838e298aaf4de5de28c7d4f
2017-02-23 13:44:24 +00:00
Paul Duffin
5da6f4fbd1 Merge "Fix build failure when using javac toolchain"
am: c098bea921

Change-Id: I56e965336c537295efc4c0c778f5c236f955bf10
2017-02-23 13:43:07 +00:00
Paul Duffin
a26000b8f5 Merge "Deprecate TestSuiteBuilder and related classes." 2017-02-23 13:36:30 +00:00
Paul Duffin
c098bea921 Merge "Fix build failure when using javac toolchain" 2017-02-23 13:34:39 +00:00
Makoto Onuki
a08c6a1cfb DO NOT MERGE Relax isUserRunning check and allow in-profile calls
Bug 30475753
Bug 35667752

Change-Id: I739ee7e259f041f5e133edf048b6b54cb7a770db
(cherry picked from commit 8198deacb5)
2017-02-23 11:24:34 +00:00
Chen Xu
201320492c Merge "renaming telephony internal hidden intents" am: 09c663a84c
am: 979e4690ec

Change-Id: I8cce065cc9ce6a87fa0ce9753a5e9170da77da59
2017-02-23 02:08:33 +00:00
Chen Xu
979e4690ec Merge "renaming telephony internal hidden intents"
am: 09c663a84c

Change-Id: Ic20ae9e6816d629c979859a7d18f1827bafcc034
2017-02-23 02:03:00 +00:00
Chen Xu
09c663a84c Merge "renaming telephony internal hidden intents" 2017-02-23 01:55:25 +00:00
Brad Ebinger
21013dcf1b 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
2017-02-22 16:58:50 -08:00
Brad Ebinger
609cfc916b resolve merge conflicts of ac9b2c4fab to stage-aosp-master
am: 4fb8988854

Change-Id: Ic679f452ad245cbe58ea8069c34c15e50ee9e5c2
2017-02-23 00:57:23 +00:00
Brad Ebinger
4fb8988854 resolve merge conflicts of ac9b2c4fab to stage-aosp-master
Change-Id: I4a6094c41ab267f89a15c5e8caa25e6b683419d0
2017-02-22 16:04:39 -08:00
Brad Ebinger
ac9b2c4fab Merge "Add UI prompt for MMI code failure on 3gpp" 2017-02-22 23:22:07 +00:00
Calvin On
f17c1d4888 Replace WearWifi/Cell services with WearConnectivityService am: 5555bccc70
am: abfd5bccb9

Change-Id: If051c765d3ea81cce2bedc2dfa02d64744088054
2017-02-22 22:48:23 +00:00
Calvin On
abfd5bccb9 Replace WearWifi/Cell services with WearConnectivityService
am: 5555bccc70

Change-Id: I5d8c97b8d5c394aeae99b7ddbe0dfdd5706a4293
2017-02-22 22:41:41 +00:00
Hall Liu
ba6c607728 Merge "Introduce APIs for RTT calls (part 1)" am: 27ad05169e
am: d83b06cd31

Change-Id: Id3608cf918d829ed785d7b75dffa6b6ce6990f34
2017-02-22 19:00:55 +00:00
Hall Liu
d83b06cd31 Merge "Introduce APIs for RTT calls (part 1)"
am: 27ad05169e

Change-Id: I3fb3cb89b467e5df808967dcd478964a84e2e61f
2017-02-22 18:56:48 +00:00
Hall Liu
27ad05169e Merge "Introduce APIs for RTT calls (part 1)" 2017-02-22 18:48:53 +00:00
Paul Duffin
da4597769b Merge "Remove conflicting package information for junit.runner and junit.textui" am: f3f4775a35
am: 9b5522f8c4

Change-Id: I4925285c1ea3027d46ac396b8ea29ac44c075e0d
2017-02-22 15:27:51 +00:00
Paul Duffin
9b5522f8c4 Merge "Remove conflicting package information for junit.runner and junit.textui"
am: f3f4775a35

Change-Id: Ie0ca0b2b6b5f06e90f55996625f758521c9039cb
2017-02-22 15:24:27 +00:00
Paul Duffin
253ad40649 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
2017-02-22 15:18:19 +00:00
Treehugger Robot
f3f4775a35 Merge "Remove conflicting package information for junit.runner and junit.textui" 2017-02-22 15:15:34 +00:00
Paul Duffin
f1c59610bb 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
2017-02-22 14:42:46 +00:00
Paul Duffin
f845fec30c 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
2017-02-22 12:43:57 +00:00
Daniel Nishi
e13bfbde1a Don't crash when primary volume is null in AppCollector.
am: d54f3a487b

Change-Id: I77e27f4a7e901e98995039bcfd68453bec83a6cd
2017-02-22 04:04:38 +00:00
Hugo Benichi
0f99e5367b Merge "ConnectivityManager: allow custom Handlers" am: ef69246260
am: cb47118af1

Change-Id: I04171173890b161c053c41a2a5c7e1602e510b8c
2017-02-22 03:51:08 +00:00
Hugo Benichi
cb47118af1 Merge "ConnectivityManager: allow custom Handlers"
am: ef69246260

Change-Id: I8da5540f6561cdef4adc91bbeeb9c21a91c08d49
2017-02-22 03:48:10 +00:00
Hugo Benichi
ef69246260 Merge "ConnectivityManager: allow custom Handlers" 2017-02-22 03:42:15 +00:00
Jack Yu
c2543c5357 Merge "Added telephony manager set sim power state API" am: cbffe38631
am: d1f5b4245f

Change-Id: I0db1ff82aa80b3719efa9c0bdc2ca0a6f39347a5
2017-02-22 02:56:44 +00:00
Jack Yu
d1f5b4245f Merge "Added telephony manager set sim power state API"
am: cbffe38631

Change-Id: I9fbe161505905c3d3c1c431d1589248324fb3e4f
2017-02-22 02:50:29 +00:00
Treehugger Robot
cbffe38631 Merge "Added telephony manager set sim power state API" 2017-02-22 02:45:18 +00:00
Jack Yu
e25a4dfb6a 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
2017-02-21 17:36:45 -08:00
Daniel Nishi
d54f3a487b 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
2017-02-22 01:14:35 +00:00
Calvin On
5555bccc70 Replace WearWifi/Cell services with WearConnectivityService
go/wear-connectivity-service

Change-Id: I2a8214e2965ad63a23dc8c174db256a263102a6f
2017-02-21 16:41:43 -08:00
Hugo Benichi
2583ef0239 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
2017-02-22 09:24:01 +09:00
Colin Cross
cfbf226165 Merge "Revert "Remove outdated emulator check which causes BT to not start"" am: 375ea2ae71
am: ebc05de919

Change-Id: Id61ee53f3147d90d8fbca053633e3115b69d3065
2017-02-21 23:37:01 +00:00
Colin Cross
ebc05de919 Merge "Revert "Remove outdated emulator check which causes BT to not start""
am: 375ea2ae71

Change-Id: I3d5abc52abf3f7c01ba4fbee47d7e487e99f5dda
2017-02-21 23:32:32 +00:00
Hall Liu
95d5587d0a 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
2017-02-21 15:27:25 -08:00
Colin Cross
375ea2ae71 Merge "Revert "Remove outdated emulator check which causes BT to not start"" 2017-02-21 23:25:07 +00:00
Brad Ebinger
8e8c26e25a Merge "Remove Session ID from ImsService APIs that do not need it." am: 975be6c065
am: 50bc658e20

Change-Id: I2b2e4b0cbfcee5dd19f6d79ce5a949ca61140ffb
2017-02-21 20:28:09 +00:00
Brad Ebinger
50bc658e20 Merge "Remove Session ID from ImsService APIs that do not need it."
am: 975be6c065

Change-Id: I09469d99bc68133a4de594507854c269e905c40e
2017-02-21 20:24:21 +00:00