Commit Graph

380355 Commits

Author SHA1 Message Date
TreeHugger Robot
aefe326db0 Merge "Add a debug property to enable Skia systrace" 2018-07-02 14:21:24 +00:00
Sehee Park
817c832eb4 Merge "Modify catch when addInterfaceToLocalNetwork() is called." am: ccd6a0f6c2 am: c7b925063f
am: 48396e8616

Change-Id: Idb98c57e8e1791eefdf47f9127696211a4ff3a99
2018-07-02 06:55:33 -07:00
Sehee Park
48396e8616 Merge "Modify catch when addInterfaceToLocalNetwork() is called." am: ccd6a0f6c2
am: c7b925063f

Change-Id: Ia160a4cf42e427575a70810d7157e092e47b5992
2018-07-02 06:46:09 -07:00
Stan Iliev
02daab6ff2 Add a debug property to enable Skia systrace
Add a "debug.hwui.skia_atrace_enabled" property that allows to
record a systrace with skia drawing ops. App need to be restarted
after setting the new propety to true.

Test: collected skia trace with systemui
Change-Id: I2d1c5911714bfc911894f633ec2df2f6bb953b48
2018-07-02 13:45:53 +00:00
Sehee Park
c7b925063f Merge "Modify catch when addInterfaceToLocalNetwork() is called."
am: ccd6a0f6c2

Change-Id: I9842ae51d3bb4665f5cb24b7685a05de2df05097
2018-07-02 06:23:35 -07:00
Treehugger Robot
ccd6a0f6c2 Merge "Modify catch when addInterfaceToLocalNetwork() is called." 2018-07-02 11:22:28 +00:00
Sehee Park
a1874cc580 Modify catch when addInterfaceToLocalNetwork() is called.
Fatal Exception is occured in system process. Becuase addInterfaceToLocalNetwork()
throw IllegalStateException but it can not be handled in TetherInterfaceStateMachine.
Modify catch from "RemoteException" to "Exception" when addInterfaceToLocalNetwork() is called.

Test: Repeat on/off tethering
Test: "runtest --no-hidden-api-checks frameworks-net" passes

Bug: 110396460
Change-Id: I2f2f1325cfcce40c3113ccccf69b2bbd5df4ae5b
Signed-off-by: Sehee Park <sehee32.park@samsung.com>
2018-07-02 18:17:31 +09:00
TreeHugger Robot
ce77407144 Merge "StrictMode to catch storage while locked." 2018-06-30 22:04:26 +00:00
Jeff Sharkey
41cebf51c5 Merge "Get android.os tests running against real APIs." 2018-06-30 21:02:54 +00:00
SongFerng Wang
843e54f903 Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev am: d7b5946628
am: fce00ebc0a

Change-Id: I346193114b57f7eb1e06cc3b013eff0ada806f5c
2018-06-29 23:42:32 -07:00
SongFerng Wang
fce00ebc0a Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev
am: d7b5946628

Change-Id: I7f11346be248bd325f14d7039f5a5d5b2f45617a
2018-06-29 23:34:15 -07:00
SongFerng Wang
d7b5946628 Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev 2018-06-30 06:22:12 +00:00
Kevin Chyn
349471a1ed Merge "Add face metrics constants" 2018-06-30 02:22:29 +00:00
Android Build Merger (Role)
17224190ac Merge "[automerger skipped] Merge "Used APN type instead of APN id" am: 2e371c1b5a am: a916542011 am: 8f76322f75 -s ours" 2018-06-30 01:51:02 +00:00
TreeHugger Robot
c984df9763 Merge "Fix a NPE in BatteryStatsImpl" 2018-06-30 01:50:19 +00:00
Jack Yu
7bdabe9478 [automerger skipped] Merge "Used APN type instead of APN id" am: 2e371c1b5a am: a916542011
am: 8f76322f75  -s ours

Change-Id: Id0bb6219082d66ca62db3fc7908e3643b1108739
2018-06-29 18:50:17 -07:00
Jack Yu
8f76322f75 Merge "Used APN type instead of APN id" am: 2e371c1b5a
am: a916542011

Change-Id: I58bb518a7720e65edd73d93b5775fa4cc40b41db
2018-06-29 18:40:06 -07:00
SongFerngWang
060571655e add three new carrier configs for call forwarding, Caller ID and Call Waiting.
The carrier configs control the call forwarding and additional
settings button in the Call Settings menu and caller ID and
call waiting in additional settings menu.

Bug: 110121209
Test: manual - test case as below :
1.flag clir on and flag cw on ,do CLIR show/hide,
    and make call to other device.(PASS)
2.flag clir on and flag cw on ,do CW on/off,and CW function work.(PASS)
3.flag clir off and flag cw on ,no CLIR in additional settings page(PASS)
4.flag clir off and flag cw on ,do CW on/off,and CW function work.(PASS)
5.flag clir on and flag cw off ,do CLIR show/hide ,
    and make call to other device.(PASS)
6.flag clir on and flag cw off ,no CW in additional settings page(PASS)
7.flag clir off and flag cw off,
    no Additional Settings in call feature settings(PASS)
8.flag cf off,no cf in call settings page (PASS)

Change-Id: I29d7a71ad57b3b05ccc6025154f63119b35dab71
2018-06-30 09:14:58 +08:00
Jack Yu
a916542011 Merge "Used APN type instead of APN id"
am: 2e371c1b5a

Change-Id: Ib920746cb39937165aa97f79a9ac4e2fed850572
2018-06-29 18:06:39 -07:00
Kevin Chyn
082c201438 Merge "FaceManager removal callback should propagate remaining" 2018-06-30 00:56:32 +00:00
TreeHugger Robot
716b07cf9b Merge "Fix the memory leak in BatteryStatsImpl.Timebase.mObservers." 2018-06-30 00:54:26 +00:00
TreeHugger Robot
cee49cd54d Merge "Make scroll bars more noticeable on round screens." 2018-06-30 00:26:35 +00:00
TreeHugger Robot
e26fae649b Merge "Moved more stuff from ActivityManagerService to ActivityTaskManagerService (11/n)" 2018-06-30 00:21:40 +00:00
Mike Ma
31cdfb401d Fix a NPE in BatteryStatsImpl
ServiceManager.getService("batteryproperties")) may return null for some
devices right after boot. (We don't know why, need further investigation)
This causes async batterystats update to crash, leaving BatteryStats in a
bad state (OnBattery() == true, but mOnBatteryTimeBase is not running),
which does not accept aggregated stats update anymore.

Bug: 109930230
Test: manual
Change-Id: I0654beff95f0a2b9df2567f1a2efffd3330e58ff
2018-06-29 16:55:17 -07:00
Jack Yu
2e371c1b5a Merge "Used APN type instead of APN id" 2018-06-29 23:54:32 +00:00
Wale Ogunwale
f673393b93 Moved more stuff from ActivityManagerService to ActivityTaskManagerService (11/n)
Moved more stuff related to activities out of the current service to the new one.

Bug: 80414790
Fixes: 110988007
Test: Existing tests pass.
Change-Id: Iceed1da8a7441a26d11efebc6d9f692fd053bc7f
2018-06-29 23:51:01 +00:00
Jeff Sharkey
c609116a1b Get android.os tests running against real APIs.
Combination of moving to existing public API, tagging things as
@TestApi, and bringing utility methods into tests.

Bug: 13282254
Test: atest cts/tests/tests/os/
Change-Id: Ifd24c0d048d200e8595e194890cc1dc53ddc2b3e
2018-06-29 17:15:44 -06:00
Nathan Harold
4b12916e79 Merge changes I0d635067,I1424973b am: 4d7a010983 am: 3b08d8ff77
am: dcfa685cad

Change-Id: I683f6f829ee106196eb266b5bdb7ee450c259c02
2018-06-29 15:59:58 -07:00
Shep Shapard
1934a54a61 Merge "Fix invisible scroll thumb blocks clicks." 2018-06-29 22:54:58 +00:00
Nathan Harold
dcfa685cad Merge changes I0d635067,I1424973b am: 4d7a010983
am: 3b08d8ff77

Change-Id: I323c57f0ad262a5875fcac7370dfb75d116f4bca
2018-06-29 15:46:45 -07:00
Nathan Harold
3b08d8ff77 Merge changes I0d635067,I1424973b
am: 4d7a010983

Change-Id: I4372305da9b4b6b488bdeda0ec97b412e92bce58
2018-06-29 15:39:19 -07:00
Amit Mahajan
0c16e74bc0 [automerger skipped] Merge "Add new carrier config for CDMA registered PLMN when not roaming." am: c8eb9ef591 am: d7a5190868 -s ours
am: 0c50371d12  -s ours

Change-Id: I09a6f75b9884a7c1ecc3a87502f1ace87210df97
2018-06-29 15:07:03 -07:00
Kevin Chyn
0e58dbd7de Add face metrics constants
Bug: 110589286

Test: builds
Change-Id: I9e369a38c6e41bb98b1fac5abd248f46382a0928
2018-06-29 14:52:55 -07:00
Jack Yu
bfa6635c30 Used APN type instead of APN id
APN id is similar to ApnSetting.ApnType. We can just use the apn
type. No need to use APN id anymore.

Test: Telephony sanity tests + unit tests
Bug: 77511388
Merged-In: If41845604ea14f36272262da110d682eea0d5451
Change-Id: If41845604ea14f36272262da110d682eea0d5451
(cherry picked from commit f42d06010a)
2018-06-29 14:52:52 -07:00
Amit Mahajan
0c50371d12 [automerger skipped] Merge "Add new carrier config for CDMA registered PLMN when not roaming." am: c8eb9ef591
am: d7a5190868  -s ours

Change-Id: Id98081b344dd9bd9376adcbcff23f7d1506c35af
2018-06-29 14:43:38 -07:00
TreeHugger Robot
64801670b1 Merge "Skip hardware bitmaps if canvas does not support hardware acceleration" 2018-06-29 21:26:24 +00:00
Nathan Harold
4d7a010983 Merge changes I0d635067,I1424973b
* changes:
  Simplify equals() method of ServiceState
  Update ServiceState.hashCode()
2018-06-29 21:23:26 +00:00
Amit Mahajan
d7a5190868 Merge "Add new carrier config for CDMA registered PLMN when not roaming."
am: c8eb9ef591

Change-Id: I1cc5af7ab6cbb722c14b549047cccd73a5ad9720
2018-06-29 14:05:51 -07:00
TreeHugger Robot
e90533787d Merge "Used APN type instead of APN id" 2018-06-29 20:30:51 +00:00
Kevin Chyn
7e88d113d6 FaceManager removal callback should propagate remaining
Fixes: 110994796

Test: builds
Change-Id: I9a82a50a8bbd4b0c21a2acef33c9ec3fdff5c7f8
2018-06-29 12:57:01 -07:00
Treehugger Robot
c8eb9ef591 Merge "Add new carrier config for CDMA registered PLMN when not roaming." 2018-06-29 19:55:16 +00:00
TreeHugger Robot
55f420a585 Merge "[NR] Remove unnecessary boolean change, update var names" 2018-06-29 19:36:11 +00:00
Lucas Dupin
d3989e4d09 Merge "AOD animation polish" into pi-dev am: 704a0d6174
am: e9861964bf

Change-Id: I135ff3a852d2b1d2288add1c0c94bbf7313d1aec
2018-06-29 11:47:32 -07:00
Lucas Dupin
e9861964bf Merge "AOD animation polish" into pi-dev
am: 704a0d6174

Change-Id: Ia5662e819573ba45707f4f2dd4f166c64d87154e
2018-06-29 11:40:43 -07:00
Lucas Dupin
704a0d6174 Merge "AOD animation polish" into pi-dev 2018-06-29 18:27:46 +00:00
Amit Mahajan
ab790a123b Add new carrier config for CDMA registered PLMN when not roaming.
Test: manual
Bug: 80145031
Merged-in: I6533b4097f729df88f287348924563c6f459401c
Change-Id: I6533b4097f729df88f287348924563c6f459401c
(cherry picked from commit 22e89f4773)
2018-06-29 11:02:56 -07:00
shepshapard
5229200dd3 Fix invisible scroll thumb blocks clicks.
The current issue is that Views that have either the horizontal or
vertical scroll bars enabled will intercept mouse interactions that
entire the region where the scrolling thumb would be even if the View
cannot actually scroll because it's content isn't larger than it.

This is fixed by only intercepting mouse interactions in the scroll
thumb region if there is something to scroll.

Bug: 110375792
Test: None yet

Change-Id: Ib638b4ac88375f55bc80ba2a66d945a16ecd6d22
2018-06-29 10:57:18 -07:00
Amit Mahajan
304c3b3b8a Merge "Add new carrier config for CDMA registered PLMN when not roaming." into pi-dev am: fffc308084
am: 93c577b224

Change-Id: Ie635c49b097d758c96e882249a4b0ad61c85b730
2018-06-29 10:53:14 -07:00
Jeff Sharkey
dd02e33417 StrictMode to catch storage while locked.
When an app starts becoming Direct Boot aware, it can be difficult
to track down all the places they're reading data from credential
protected storage.

When a user is locked, credential protected storage is unavailable,
and files stored in these locations appear to not exist, which can
result in subtle app bugs if they assume default behaviors or
empty states. Instead, apps should store data needed while a user
is locked under device protected storage areas.

Bug: 110413274
Test: atest cts/tests/tests/os/src/android/os/cts/StrictModeTest.java
Change-Id: Ia390318efa6fefda8f10ac684d0206e67aa1d3dc
2018-06-29 11:41:00 -06:00
Jack Yu
f42d06010a Used APN type instead of APN id
APN id is similar to ApnSetting.ApnType. We can just use the apn
type. No need to use APN id anymore.

Test: Telephony sanity tests + unit tests
Bug: 77511388
Change-Id: If41845604ea14f36272262da110d682eea0d5451
2018-06-29 10:34:48 -07:00