OSDN Git Service

android-x86/frameworks-base.git
7 years agoRevert "Correct dissapearing SurfaceView during exit animations."
Rob Carr [Fri, 3 Mar 2017 01:15:48 +0000 (01:15 +0000)]
Revert "Correct dissapearing SurfaceView during exit animations."

This reverts commit 026a6c45e77d3dec8f7ae26b74fe6fba18021caf.

Change-Id: I3ff0d64ca9f91aef4b5a53ed47e4d05f0d128e11

7 years agoCorrect dissapearing SurfaceView during exit animations.
Robert Carr [Wed, 1 Mar 2017 21:13:45 +0000 (13:13 -0800)]
Correct dissapearing SurfaceView during exit animations.

We were missing a call to detachChildren in the case
that the visibility change originates from AM (rather than relayout).
Thus we were racing relayout with the client to detach fast enough.
Detach before notifying the client of window visibility changes.

Test: Slow down animation speed. Open close SV app (say Chrome). No flashes.
Change-Id: Ibf027c2ca295f25765ba95b36c1346a715f3bc6e

7 years agoMerge "Add direct sensor report NDK API"
Peng Xu [Wed, 1 Mar 2017 17:58:31 +0000 (17:58 +0000)]
Merge "Add direct sensor report NDK API"

7 years agoMerge "Merge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43...
Android Build Merger (Role) [Wed, 1 Mar 2017 17:55:35 +0000 (17:55 +0000)]
Merge "Merge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43 am: b50d958c4a am: 756216fdf9"

7 years agoMerge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43 am: b50d958c4a
Etan Cohen [Wed, 1 Mar 2017 17:54:35 +0000 (17:54 +0000)]
Merge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43 am: b50d958c4a
am: 756216fdf9

Change-Id: I5cdfbac3dafeecde732ea641cfcfee34c5e376ed

7 years agoMerge "Fix premultiplied flag for hardware bitmaps"
Sergey Vasilinets [Wed, 1 Mar 2017 17:54:05 +0000 (17:54 +0000)]
Merge "Fix premultiplied flag for hardware bitmaps"

7 years agoMerge "Channels for Frameworks notifications"
Geoffrey Pitsch [Wed, 1 Mar 2017 17:51:19 +0000 (17:51 +0000)]
Merge "Channels for Frameworks notifications"

7 years agoMerge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43
Etan Cohen [Wed, 1 Mar 2017 17:49:32 +0000 (17:49 +0000)]
Merge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43
am: b50d958c4a

Change-Id: I99cdde15f3ea9dc4630ccd09a242f3a1148d33bb

7 years agoMerge "Modify SurfaceView to use SurfaceFlinger child surfaces."
Rob Carr [Wed, 1 Mar 2017 17:49:23 +0000 (17:49 +0000)]
Merge "Modify SurfaceView to use SurfaceFlinger child surfaces."

7 years agoMerge "[AWARE] Add data-path security configuration (PMK)"
Etan Cohen [Wed, 1 Mar 2017 17:45:42 +0000 (17:45 +0000)]
Merge "[AWARE] Add data-path security configuration (PMK)"
am: eff6f4fc43

Change-Id: I90b6324a903b6307c084c891d7eba75957e13886

7 years agoMerge "[AWARE] Add data-path security configuration (PMK)"
Etan Cohen [Wed, 1 Mar 2017 17:39:14 +0000 (17:39 +0000)]
Merge "[AWARE] Add data-path security configuration (PMK)"

7 years agoMerge "Reduce flakes."
TreeHugger Robot [Wed, 1 Mar 2017 17:37:36 +0000 (17:37 +0000)]
Merge "Reduce flakes."

7 years agoMerge "Avoid deadlock when installing app"
TreeHugger Robot [Wed, 1 Mar 2017 17:30:08 +0000 (17:30 +0000)]
Merge "Avoid deadlock when installing app"

7 years agoresolve merge conflicts of 81a28efd1b16 to stage-aosp-master am: b455f0deed
Tyler Gunn [Wed, 1 Mar 2017 17:03:04 +0000 (17:03 +0000)]
resolve merge conflicts of 81a28efd1b16 to stage-aosp-master am: b455f0deed
am: 63700b7a8f  -s ours

Change-Id: I485e67447ad5004410ae1d719a4b48baed606517

7 years agoMerge "Expose isInstantApp() to more callers"
TreeHugger Robot [Wed, 1 Mar 2017 16:58:33 +0000 (16:58 +0000)]
Merge "Expose isInstantApp() to more callers"

7 years agoresolve merge conflicts of 81a28efd1b16 to stage-aosp-master
Tyler Gunn [Wed, 1 Mar 2017 16:51:27 +0000 (16:51 +0000)]
resolve merge conflicts of 81a28efd1b16 to stage-aosp-master
am: b455f0deed

Change-Id: Idca0886e3d6e4f1a5eaeeec98e6c7ed46985a29f

7 years agoresolve merge conflicts of 81a28efd1b16 to stage-aosp-master
Tyler Gunn [Wed, 1 Mar 2017 16:44:32 +0000 (08:44 -0800)]
resolve merge conflicts of 81a28efd1b16 to stage-aosp-master

Change-Id: Ic4c1ca055db8e70db49d9fc91dfc705da6136a5d

7 years agoMerge "Rename android.os.Build so it can be dynamically generated"
Diego Perez [Wed, 1 Mar 2017 16:11:11 +0000 (16:11 +0000)]
Merge "Rename android.os.Build so it can be dynamically generated"

7 years agoMerge "Support confirmation of international calls while on WFC only."
Tyler Gunn [Wed, 1 Mar 2017 16:08:39 +0000 (16:08 +0000)]
Merge "Support confirmation of international calls while on WFC only."

7 years agoReduce flakes.
Julia Reynolds [Wed, 1 Mar 2017 14:33:41 +0000 (09:33 -0500)]
Reduce flakes.

Test: runtest systemui-notifications
Change-Id: I48dc8be786246e6c639a14b16784a394eac49a6b

7 years agoAvoid deadlock when installing app
Shunta Sato [Wed, 19 Oct 2016 06:58:52 +0000 (15:58 +0900)]
Avoid deadlock when installing app

Symptom:
System crash is occurred by deadlock

Root cause:
ActivityManagerService's APIs usually hold a lock of itself instance.

In this case, four threads tried to take the same lock and it caused
deadlock.
Following three objects are in a three-cornered deadlocked.
- ActivityManagerService's instance
- PackageInstallerSession.mLock
- PackageManagerService.mPackages

Solution:
Call checkUidPermission before taking a lock of ActivityManagerService's
instance.

Fixes: 32425801
Test: manual
Author: Kazuki Nakayama <kazuki.x.nakayama@sonymobile.com>
Change-Id: I71ce57b1b8f3e0e9ba64b94a7b1f210b702efb6a

7 years ago[AWARE] Add data-path security configuration (PMK)
Etan Cohen [Tue, 21 Feb 2017 18:08:42 +0000 (10:08 -0800)]
[AWARE] Add data-path security configuration (PMK)

Add API to optionally provide a pairwise master key (PMK)
to configure security on a data-path.

Clarify the default API to mean open (unencrypted) data-path.

Bug: 33552694
Test: unit tests and integration (sl4a) tests
Change-Id: I43fe704547f2921b3207f215e42d253837aa04e9

7 years agoChannels for Frameworks notifications
Geoffrey Pitsch [Wed, 15 Feb 2017 14:35:38 +0000 (09:35 -0500)]
Channels for Frameworks notifications

Adapts all notifications used by system services to use channels.
Channels are initialized by SystemServer after the NotificationService
has started.

Test: runtest systemui-notification
Change-Id: I25c45293b786adb57787aeab4c2613c9d7c89dab

7 years agoMerge "Add API Surface for creating IpSec Transforms" am: 7645fa2816 am: 0a6305d5dd
Nathan Harold [Wed, 1 Mar 2017 14:22:57 +0000 (14:22 +0000)]
Merge "Add API Surface for creating IpSec Transforms" am: 7645fa2816 am: 0a6305d5dd
am: 3ddaf3e6b0

Change-Id: Idceae0e5a1af2f357378b03fc0d257dab605b217

7 years agoRename android.os.Build so it can be dynamically generated
Diego Perez [Wed, 1 Mar 2017 14:18:10 +0000 (14:18 +0000)]
Rename android.os.Build so it can be dynamically generated

This will allow the android.os.Build class to be generated dynamically
from the Studio side.
In order to allow the "refactoring" of classses like android.os.Build,
Create needed to be modified.

While adding the test, I've also done a small clean-up of the
AsmGeneratorTest to re-use some code.

Bug: http://b.android.com/210345
Test: Added new test to AsmGeneratorTest
Change-Id: Ie4e1209c1c60b7a33cb427dbd556a9741ec8f8b3

7 years agoMerge "Add API Surface for creating IpSec Transforms" am: 7645fa2816
Nathan Harold [Wed, 1 Mar 2017 14:17:46 +0000 (14:17 +0000)]
Merge "Add API Surface for creating IpSec Transforms" am: 7645fa2816
am: 0a6305d5dd

Change-Id: Ie1798e4d7dda91a970db40e078016fcbcf89149f

7 years agoMerge "Add API Surface for creating IpSec Transforms"
Nathan Harold [Wed, 1 Mar 2017 14:12:55 +0000 (14:12 +0000)]
Merge "Add API Surface for creating IpSec Transforms"
am: 7645fa2816

Change-Id: Ibe70a60c5c5808a7877145cccefcc1f11bfacc51

7 years agoMerge "Add API Surface for creating IpSec Transforms"
Treehugger Robot [Wed, 1 Mar 2017 14:05:47 +0000 (14:05 +0000)]
Merge "Add API Surface for creating IpSec Transforms"

7 years agoMerge "Fix dead lock in Tethering state machine" am: 355dbae680 am: 0703f03953
Erik Kline [Wed, 1 Mar 2017 11:55:44 +0000 (11:55 +0000)]
Merge "Fix dead lock in Tethering state machine" am: 355dbae680 am: 0703f03953
am: 83385ed04a

Change-Id: I7d0974d5ec4e3cab1581e1cce0e01eeb6bf7448a

7 years agoMerge "Fix dead lock in Tethering state machine" am: 355dbae680
Erik Kline [Wed, 1 Mar 2017 11:50:41 +0000 (11:50 +0000)]
Merge "Fix dead lock in Tethering state machine" am: 355dbae680
am: 0703f03953

Change-Id: I233d796cf67a71ebc43970f949930de46a0ddb3f

7 years agoMerge "Fix dead lock in Tethering state machine"
Erik Kline [Wed, 1 Mar 2017 11:46:10 +0000 (11:46 +0000)]
Merge "Fix dead lock in Tethering state machine"
am: 355dbae680

Change-Id: Idd08726f3eeebba49a9ad909464377af67600d30

7 years agoMerge "Fix dead lock in Tethering state machine"
Erik Kline [Wed, 1 Mar 2017 11:40:02 +0000 (11:40 +0000)]
Merge "Fix dead lock in Tethering state machine"

7 years agoMerge "Also test for additional NetworkCallback calls" am: dff6c5c30d am: 47d8385184
Erik Kline [Wed, 1 Mar 2017 11:13:14 +0000 (11:13 +0000)]
Merge "Also test for additional NetworkCallback calls" am: dff6c5c30d am: 47d8385184
am: 02310829cf

Change-Id: I0264a471312423e896a1c2f479c0eeda737a1567

7 years agoMerge "Also test for additional NetworkCallback calls" am: dff6c5c30d
Erik Kline [Wed, 1 Mar 2017 11:08:06 +0000 (11:08 +0000)]
Merge "Also test for additional NetworkCallback calls" am: dff6c5c30d
am: 47d8385184

Change-Id: I19ff91b1397abe20920bbae8aa6c976c6bcac0ba

7 years agoMerge "Also test for additional NetworkCallback calls"
Erik Kline [Wed, 1 Mar 2017 11:03:08 +0000 (11:03 +0000)]
Merge "Also test for additional NetworkCallback calls"
am: dff6c5c30d

Change-Id: I00b3f7be06bde167872d0cdefe940cda5e138846

7 years agoMerge "Also test for additional NetworkCallback calls"
Treehugger Robot [Wed, 1 Mar 2017 10:55:34 +0000 (10:55 +0000)]
Merge "Also test for additional NetworkCallback calls"

7 years agoMerge "More accurate cascading submenu position"
TreeHugger Robot [Wed, 1 Mar 2017 09:45:27 +0000 (09:45 +0000)]
Merge "More accurate cascading submenu position"

7 years agoAlso test for additional NetworkCallback calls
Erik Kline [Tue, 28 Feb 2017 07:20:20 +0000 (16:20 +0900)]
Also test for additional NetworkCallback calls

Specifcally:
    - onCapabilitiesChanged
    - onLinkPropertiesChanged
    - onNetworkSuspended

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

Change-Id: Ie0f7c8ac21313b11980bb335c89ecde6fd8e311c

7 years agoMerge "Move some static methods from NPMS to NPM class."
TreeHugger Robot [Wed, 1 Mar 2017 08:38:43 +0000 (08:38 +0000)]
Merge "Move some static methods from NPMS to NPM class."

7 years agoMerge "Fix default value for mUidState.get."
TreeHugger Robot [Wed, 1 Mar 2017 06:38:12 +0000 (06:38 +0000)]
Merge "Fix default value for mUidState.get."

7 years agoMerge "AudioService: fix volume shaper release"
TreeHugger Robot [Wed, 1 Mar 2017 06:19:16 +0000 (06:19 +0000)]
Merge "AudioService: fix volume shaper release"

7 years agoAdd API Surface for creating IpSec Transforms
Nathan Harold [Fri, 13 Jan 2017 02:38:57 +0000 (18:38 -0800)]
Add API Surface for creating IpSec Transforms

This CL adds an API to set up an IPSec Security Association
and Security Policy to perform Transport-Mode and Tunnel-Mode encapuslation
of IP Packets.

Bug: 30984788
Bug: 34811752
Test: 3481205234811227
Change-Id: Ic9f63c7bb366302a24baa3e1b79020210910ac0a

7 years agoMerge "set bounds"
TreeHugger Robot [Wed, 1 Mar 2017 02:24:30 +0000 (02:24 +0000)]
Merge "set bounds"

7 years agoMerge "Fix memory-leak warnings from the static analyzer" am: 2006bfc9ad am: 43fd84a03c
George Burgess IV [Wed, 1 Mar 2017 02:02:40 +0000 (02:02 +0000)]
Merge "Fix memory-leak warnings from the static analyzer" am: 2006bfc9ad am: 43fd84a03c
am: 0d0ccb0c19

Change-Id: I0abbba291721af2b66735dcbd33bbc406767536c

7 years agoMerge "Fix memory-leak warnings from the static analyzer" am: 2006bfc9ad
George Burgess IV [Wed, 1 Mar 2017 01:58:36 +0000 (01:58 +0000)]
Merge "Fix memory-leak warnings from the static analyzer" am: 2006bfc9ad
am: 43fd84a03c

Change-Id: Id2b577a021a3163d9f489235bf7f76c5f5ae527e

7 years agoMerge "Fix memory-leak warnings from the static analyzer"
George Burgess IV [Wed, 1 Mar 2017 01:53:27 +0000 (01:53 +0000)]
Merge "Fix memory-leak warnings from the static analyzer"
am: 2006bfc9ad

Change-Id: I2efd6e42c72d3163505a23e8a95e45526a5ef642

7 years agoMerge "Add boolean when instant apps are available"
TreeHugger Robot [Wed, 1 Mar 2017 01:49:04 +0000 (01:49 +0000)]
Merge "Add boolean when instant apps are available"

7 years agoFix premultiplied flag for hardware bitmaps
sergeyv [Tue, 28 Feb 2017 23:25:10 +0000 (15:25 -0800)]
Fix premultiplied flag for hardware bitmaps

Test: android.uirendering.cts.testclasses.HardwareBitmapTests
bug:35752428
Change-Id: I2d21822e13c007c760f2fb42370aeb9240fcb5fa

7 years agoMerge "Fix memory-leak warnings from the static analyzer"
Treehugger Robot [Wed, 1 Mar 2017 01:45:51 +0000 (01:45 +0000)]
Merge "Fix memory-leak warnings from the static analyzer"

7 years agoAdd direct sensor report NDK API
Peng Xu [Thu, 16 Feb 2017 07:25:21 +0000 (23:25 -0800)]
Add direct sensor report NDK API

Added libandroid mapping and implementation of the following API:

  * ASensorManager_configureDirectReport
  * ASensorManager_createSharedMemoryDirectChannel
  * ASensorManager_createHardwareBufferDirectChannel
  * ASensorManager_destroyDirectChannel
  * ASensor_getHighestDirectReportRateLevel
  * ASensor_isDirectChannelTypeSupported

Test:  cts-tradefed run cts --module CtsSensorTestCases \
      --test android.hardware.cts.SensorNativeTest

Bug: 30985702
Change-Id: Ic808cc50d1ecbc789944ef77a4b247dc0c83c28a

7 years agoMerge "Merge "Add @hide to RttAudioMode IntDef" am: 22af0f3377 am: c284379659 am...
Android Build Merger (Role) [Wed, 1 Mar 2017 01:11:50 +0000 (01:11 +0000)]
Merge "Merge "Add @hide to RttAudioMode IntDef" am: 22af0f3377 am: c284379659 am: f000639f82"

7 years agoMerge "Add @hide to RttAudioMode IntDef" am: 22af0f3377 am: c284379659
Hall Liu [Wed, 1 Mar 2017 01:11:04 +0000 (01:11 +0000)]
Merge "Add @hide to RttAudioMode IntDef" am: 22af0f3377 am: c284379659
am: f000639f82

Change-Id: Ibcb239e0aa3499386f6f71026084276b07554cdb

7 years agoMerge "Introduce ANSWER_PHONE_CALLS permission"
TreeHugger Robot [Wed, 1 Mar 2017 01:10:17 +0000 (01:10 +0000)]
Merge "Introduce ANSWER_PHONE_CALLS permission"

7 years agoMerge "Add @hide to RttAudioMode IntDef" am: 22af0f3377
Hall Liu [Wed, 1 Mar 2017 01:05:58 +0000 (01:05 +0000)]
Merge "Add @hide to RttAudioMode IntDef" am: 22af0f3377
am: c284379659

Change-Id: I892dd9f7c070aade5962b53277a860a55ed237ea

7 years agoMerge "Add @hide to RttAudioMode IntDef"
Hall Liu [Wed, 1 Mar 2017 01:01:29 +0000 (01:01 +0000)]
Merge "Add @hide to RttAudioMode IntDef"
am: 22af0f3377

Change-Id: Ifdfdf7ced2f88188314475c99dd58cdf886f014d

7 years agoMerge "Add @hide to RttAudioMode IntDef"
Hall Liu [Wed, 1 Mar 2017 00:51:37 +0000 (00:51 +0000)]
Merge "Add @hide to RttAudioMode IntDef"

7 years agoExpose isInstantApp() to more callers
Todd Kennedy [Wed, 1 Mar 2017 00:34:15 +0000 (16:34 -0800)]
Expose isInstantApp() to more callers

Instead of just allowing the instant app itself, also allow anyone
with ACCESS_INSTANT_APP permission or apps that the instant app
has granted access.

Change-Id: I5a79ef9520db908ba9ab56af0157b1646d2d8cc1
Fixes: 34123112
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest

7 years agoMerge "fix typo"
Todd Kennedy [Wed, 1 Mar 2017 00:25:01 +0000 (00:25 +0000)]
Merge "fix typo"

7 years agofix typo
Todd Kennedy [Wed, 1 Mar 2017 00:20:09 +0000 (16:20 -0800)]
fix typo

Fixes: 35840741
Test: None; it's a javadoc fix
Change-Id: Ic59fe12351c24630d7ba18ffaafeef8035be35f5

7 years agoFix memory-leak warnings from the static analyzer
George Burgess IV [Wed, 25 Jan 2017 00:30:22 +0000 (16:30 -0800)]
Fix memory-leak warnings from the static analyzer

Warnings:
frameworks/base/core/jni/android_view_InputChannel.cpp:145:5: warning:
Potential memory leak
jobject serverChannelObj =
android_view_InputChannel_createInputChannel(env,
^~~~~~~~~~~~~~~~~~~~~~~~
frameworks/base/core/jni/android_view_InputChannel.cpp:151:5: warning:
Potential memory leak
jobject clientChannelObj =
android_view_InputChannel_createInputChannel(env,
^~~~~~~~~~~~~~~~~~~~~~~~

The warnings were complaining about that we might leak
nativeInputChannel, in android_view_InputChannel_createInputChannel,
since we're allocating it as an arg and not always putting it somewhere.

Bug: None
Test: Builds without warnings
Change-Id: I62163adee5d420ad78c8d4c74aafefc8a58f765b

7 years agoMerge "Sending explicit broadcast to the launcher when a package is installed"
Sunny Goyal [Tue, 28 Feb 2017 23:58:35 +0000 (23:58 +0000)]
Merge "Sending explicit broadcast to the launcher when a package is installed"

7 years agoMerge "Remove drawer code from settings"
TreeHugger Robot [Tue, 28 Feb 2017 23:38:42 +0000 (23:38 +0000)]
Merge "Remove drawer code from settings"

7 years agoAdd boolean when instant apps are available
Todd Kennedy [Mon, 27 Feb 2017 19:45:13 +0000 (11:45 -0800)]
Add boolean when instant apps are available

Bug: 34168547
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Change-Id: Ic1072d02aa4d43947e689e4381c2c5ee43704dd0

7 years agoMerge "Check hwbinder status before checking the returned result"
TreeHugger Robot [Tue, 28 Feb 2017 23:23:10 +0000 (23:23 +0000)]
Merge "Check hwbinder status before checking the returned result"

7 years agoAdd @hide to RttAudioMode IntDef
Hall Liu [Tue, 28 Feb 2017 23:17:44 +0000 (15:17 -0800)]
Add @hide to RttAudioMode IntDef

IntDefs apparently require an @hide annotation to avoid breaking CTS
tests. Adding it here.

Change-Id: Ifd748b55e68091132571df7e74fdb797bd6a83fc
Test: CTS
Fix: 35808951

7 years agoMerge "TIF: add WatchNextPrograms in TvContracts"
TreeHugger Robot [Tue, 28 Feb 2017 23:14:54 +0000 (23:14 +0000)]
Merge "TIF: add WatchNextPrograms in TvContracts"

7 years agoset bounds
Todd Kennedy [Tue, 28 Feb 2017 23:11:52 +0000 (15:11 -0800)]
set bounds

temporary workaround to prevent ephemeral app uninstallation from
crashing the system server.

Bug: 35673160
Test: manually uninstall ephemeral app and see the framework doesn't crash
Change-Id: I6542206b51a00ca4321de4310a59620569b1516a

7 years agoAudioService: fix volume shaper release
Jean-Michel Trivi [Tue, 28 Feb 2017 22:56:04 +0000 (14:56 -0800)]
AudioService: fix volume shaper release

Catch exception when applying a volume shaper to cancel any remaining
  volume shaper for release

Test: see bug
Bug: 35842573
Change-Id: Ic724a43fad6df599540369c095498c8adb2c73a8

7 years agoMerge "Send the IMS_SERVICE_UP intent when it is STATE_READY" am: b987777f20 am:...
Brad Ebinger [Tue, 28 Feb 2017 23:00:28 +0000 (23:00 +0000)]
Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY" am: b987777f20 am: 59282ad8df
am: 81f7d06a5e

Change-Id: I006cb9e34093cfccbfb036c82c95adc91d8cc28e

7 years agoMerge "Send the IMS_SERVICE_UP intent when it is STATE_READY" am: b987777f20
Brad Ebinger [Tue, 28 Feb 2017 22:55:55 +0000 (22:55 +0000)]
Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY" am: b987777f20
am: 59282ad8df

Change-Id: I9637f55a80f89afa89111b5889b69987aba3e20a

7 years agoMerge "Send the IMS_SERVICE_UP intent when it is STATE_READY"
Brad Ebinger [Tue, 28 Feb 2017 22:50:38 +0000 (22:50 +0000)]
Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY"
am: b987777f20

Change-Id: I6c33449b917b6d0c2a3396eea40065c2b0bc6862

7 years agoMerge "Cleanup else blocks on security checks."
TreeHugger Robot [Tue, 28 Feb 2017 22:49:57 +0000 (22:49 +0000)]
Merge "Cleanup else blocks on security checks."

7 years agoMerge "Move SystemPerfTest out of java.* namespace"
TreeHugger Robot [Tue, 28 Feb 2017 22:49:14 +0000 (22:49 +0000)]
Merge "Move SystemPerfTest out of java.* namespace"

7 years agoMerge "Send the IMS_SERVICE_UP intent when it is STATE_READY"
Brad Ebinger [Tue, 28 Feb 2017 22:44:54 +0000 (22:44 +0000)]
Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY"

7 years agoMerge "Do not send onTimeChanged updates if nothing actually changed."
Aurimas Liutikas [Tue, 28 Feb 2017 22:35:55 +0000 (22:35 +0000)]
Merge "Do not send onTimeChanged updates if nothing actually changed."

7 years agoMerge "BatteryManager: rename BATTERY_PROPERTY_BATTERY_STATUS"
TreeHugger Robot [Tue, 28 Feb 2017 22:33:44 +0000 (22:33 +0000)]
Merge "BatteryManager: rename BATTERY_PROPERTY_BATTERY_STATUS"

7 years agoMerge "Delete ParcelableString, add StringParceledListSlice"
TreeHugger Robot [Tue, 28 Feb 2017 22:09:02 +0000 (22:09 +0000)]
Merge "Delete ParcelableString, add StringParceledListSlice"

7 years agoMerge "Don't crash if client token is null."
TreeHugger Robot [Tue, 28 Feb 2017 22:06:15 +0000 (22:06 +0000)]
Merge "Don't crash if client token is null."

7 years agoMerge "Earlier processing of DrmInfo notification"
Hassan Shojania [Tue, 28 Feb 2017 21:21:57 +0000 (21:21 +0000)]
Merge "Earlier processing of DrmInfo notification"

7 years agoSupport confirmation of international calls while on WFC only.
Tyler Gunn [Fri, 17 Feb 2017 00:21:14 +0000 (16:21 -0800)]
Support confirmation of international calls while on WFC only.

Add new carrier config which enables a confirmation message when the user
dials an international number while on WFC only.

Add new @hide PhoneNumberUtils method which is used to determine if a
number dialed is an international number.

Test: Manual, unit.
Bug: 33272455
Merged-In: Ia7ffe10eee7d782ddc3355db616af0a48f19556e
Change-Id: Ia7ffe10eee7d782ddc3355db616af0a48f19556e

7 years agoSending explicit broadcast to the launcher when a package is installed
Sunny Goyal [Mon, 30 Jan 2017 18:43:18 +0000 (10:43 -0800)]
Sending explicit broadcast to the launcher when a package is installed

Test: Manually tested on device and add CTS tests
Bug: 32920609
Change-Id: Ic23c077a469fb41d6c4e123d4bc022899f634198

7 years agoMerge "TIF: make Channels.COLUMN_BROWSABLE visible"
Dongwon Kang [Tue, 28 Feb 2017 20:36:40 +0000 (20:36 +0000)]
Merge "TIF: make Channels.COLUMN_BROWSABLE visible"

7 years agoDo not send onTimeChanged updates if nothing actually changed.
Aurimas Liutikas [Tue, 28 Feb 2017 20:16:57 +0000 (12:16 -0800)]
Do not send onTimeChanged updates if nothing actually changed.

Bug: 29314380
Test: android.widget.cts.TimePickerTest#testSetOnTimeChangedListener now passes.
Change-Id: I4df96cd306967027ea76e2c256b50ca687eae9ba

7 years agoMerge "Don't trigger textclassifier in a11y action."
Abodunrinwa Toki [Tue, 28 Feb 2017 20:02:03 +0000 (20:02 +0000)]
Merge "Don't trigger textclassifier in a11y action."

7 years agoMerge "Fix javadocs for layout attributes"
TreeHugger Robot [Tue, 28 Feb 2017 19:59:16 +0000 (19:59 +0000)]
Merge "Fix javadocs for layout attributes"

7 years agoRemove drawer code from settings
Fan Zhang [Tue, 28 Feb 2017 00:04:32 +0000 (16:04 -0800)]
Remove drawer code from settings

Change-Id: I3e9920f62745f6ba2236e37689f7603f9a30d6a9
Fix: 35809663
Test: make RunSettingsLibRoboTests

7 years agoMerge "Fix is installed check condition in DevicePolicyManagerService"
Edman Anjos [Tue, 28 Feb 2017 19:45:22 +0000 (19:45 +0000)]
Merge "Fix is installed check condition in DevicePolicyManagerService"

7 years agoMerge "Prevent packages besides android defining ephemeral permissions"
TreeHugger Robot [Tue, 28 Feb 2017 19:39:02 +0000 (19:39 +0000)]
Merge "Prevent packages besides android defining ephemeral permissions"

7 years agoMerge "Api review feedback."
TreeHugger Robot [Tue, 28 Feb 2017 19:38:09 +0000 (19:38 +0000)]
Merge "Api review feedback."

7 years agoMerge "Bluetooth: fix enable log: display 24h time" am: 17cb857301 am: add7c533c6
Andre Eisenbach [Tue, 28 Feb 2017 19:33:42 +0000 (19:33 +0000)]
Merge "Bluetooth: fix enable log: display 24h time" am: 17cb857301 am: add7c533c6
am: 5c44929f79

Change-Id: If69f2d82f61784b79e6f64d335c70c98b89f6542

7 years agoMerge "Bluetooth: fix enable log: display 24h time" am: 17cb857301
Andre Eisenbach [Tue, 28 Feb 2017 19:29:07 +0000 (19:29 +0000)]
Merge "Bluetooth: fix enable log: display 24h time" am: 17cb857301
am: add7c533c6

Change-Id: Ib10e76a44ee4ea10294b65ba01d2b028df6afe50

7 years agoMerge "Bluetooth: fix enable log: display 24h time"
Andre Eisenbach [Tue, 28 Feb 2017 19:14:58 +0000 (19:14 +0000)]
Merge "Bluetooth: fix enable log: display 24h time"
am: 17cb857301

Change-Id: Ic9ba7b27e9ad997a6f8ba0ae6e4794903ef7806a

7 years agoMerge "Bluetooth: fix enable log: display 24h time"
Andre Eisenbach [Tue, 28 Feb 2017 19:04:13 +0000 (19:04 +0000)]
Merge "Bluetooth: fix enable log: display 24h time"

7 years agoTIF: add WatchNextPrograms in TvContracts
Dongwon Kang [Sat, 25 Feb 2017 15:27:39 +0000 (07:27 -0800)]
TIF: add WatchNextPrograms in TvContracts

Test: cts-tradefed run cts -m CtsTvTestCases
Bug: 35723325, Bug: 35724854
Change-Id: I3e476c514c73aa90fa20065e10202c2e363d5612

7 years agoBluetooth: fix enable log: display 24h time
Marie Janssen [Fri, 24 Feb 2017 19:06:33 +0000 (11:06 -0800)]
Bluetooth: fix enable log: display 24h time

Test: adb bugreport at 1pm, observe 13:xx:yy instead of 01:xx:yy
Change-Id: I172dcc63f0f43563ec692349a9434f63c55eac25

7 years agoMerge "Revert "deprecate replayClips""
Chris Craik [Tue, 28 Feb 2017 19:01:07 +0000 (19:01 +0000)]
Merge "Revert "deprecate replayClips""

7 years agoBatteryManager: rename BATTERY_PROPERTY_BATTERY_STATUS
Jin Qian [Tue, 28 Feb 2017 18:57:17 +0000 (10:57 -0800)]
BatteryManager: rename BATTERY_PROPERTY_BATTERY_STATUS

To BATTERY_PROPERTY_STATUS

Test: build
Bug: 35813122
Change-Id: Ia8308def79b79706dbdc3e47f93afa56661a47aa

7 years agoSend the IMS_SERVICE_UP intent when it is STATE_READY
Brad Ebinger [Mon, 27 Feb 2017 21:38:53 +0000 (13:38 -0800)]
Send the IMS_SERVICE_UP intent when it is STATE_READY

The ImsService must send the IMS_SERVICE_UP intent when it
signals that it is in the STATE_READY state and
IMS_SERVICE_DOWN when it is STATE_INITIALIZING or
STATE_NOT_AVAILABLE.

Also, add READ_PRIVILEGED_PHONE_STATE check

Bug: 35736451
Test: Unit tests added in frameworks/opt/telephony
Change-Id: I03d4398cf7008cf8c51b78d99eb029aa99c63f62

7 years agoMove SystemPerfTest out of java.* namespace
Colin Cross [Sun, 26 Feb 2017 16:55:26 +0000 (08:55 -0800)]
Move SystemPerfTest out of java.* namespace

dx doesn't like classes in the java.* namespace unless it is compiling
a core library.  Move SystemPerfTest to
android.perftests.SystemPerfTest.

Test: builds
Change-Id: I24951d2c9a71d8bb873763d1ccd2f1a67f2be64e

7 years agoMerge "Support confirmation of international calls while on WFC only."
TreeHugger Robot [Tue, 28 Feb 2017 18:37:33 +0000 (18:37 +0000)]
Merge "Support confirmation of international calls while on WFC only."