OSDN Git Service
SongFerngWang [Tue, 3 Jul 2018 00:12:49 +0000 (17:12 -0700)]
Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev
am:
9ccabdbc45
Change-Id: I7517b64e87b43acff501afc858c8fad433d0ecfc
TreeHugger Robot [Tue, 3 Jul 2018 00:01:52 +0000 (00:01 +0000)]
Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev
Nathan Harold [Mon, 2 Jul 2018 23:17:52 +0000 (16:17 -0700)]
Merge "Update Docstrings for CellSignalStrengthLte" am:
5e8a5d4b79
am:
0571b04c3a
Change-Id: I52a3de4f89b3a59cb4f33263cb5838d37fb0a7fb
Nathan Harold [Mon, 2 Jul 2018 23:07:37 +0000 (16:07 -0700)]
Merge "Update Docstrings for CellSignalStrengthLte"
am:
5e8a5d4b79
Change-Id: Id41fb2ccdeaf43fcc62193c78c93f4ca765d2fa2
Jorim Jaggi [Mon, 2 Jul 2018 21:47:09 +0000 (14:47 -0700)]
Merge "Only use simple rects for cutout region" into pi-dev
am:
4764921dcc
Change-Id: Icfb41008189d5c01f90afd4992428433043b4c4e
Jorim Jaggi [Mon, 2 Jul 2018 21:35:50 +0000 (21:35 +0000)]
Merge "Only use simple rects for cutout region" into pi-dev
Nathan Harold [Mon, 2 Jul 2018 20:40:55 +0000 (20:40 +0000)]
Merge "Update Docstrings for CellSignalStrengthLte"
Lucas Dupin [Mon, 2 Jul 2018 18:50:37 +0000 (11:50 -0700)]
Merge "Move charging indication vertically on time tick" into pi-dev
am:
5baaf461a6
Change-Id: I455c53bf85fd7fcfe87daef6d76888a37fecb015
TreeHugger Robot [Mon, 2 Jul 2018 18:39:55 +0000 (18:39 +0000)]
Merge "Move charging indication vertically on time tick" into pi-dev
Lucas Dupin [Wed, 27 Jun 2018 18:44:57 +0000 (11:44 -0700)]
Move charging indication vertically on time tick
Before, a new translation was only calculated when the device enters
AOD, and then, during time tick, we would only move it 5px wich isn't
enough.
Now, the translation varies 5dps vertically on every time tick.
Fixes:
110888643
Test: take screenshots for N minutes and compare them
Change-Id: Ia3f239d669b83aad0d97d8d7a7f7374f4890777d
Merged-In: Ia3f239d669b83aad0d97d8d7a7f7374f4890777d
Jorim Jaggi [Thu, 28 Jun 2018 23:14:31 +0000 (01:14 +0200)]
Only use simple rects for cutout region
Otherwise there is a big performance hit in all kinds of
situations where we do operations with the region, specifically
when:
- updating input windows
- insetting the cutout during layout
- touch dispatch
Test: DisplayCutoutTest, WmDisplayCutoutTest
Bug:
110464019
Bug:
110452325
Change-Id: I94a25c3794ecd33b8b7204ca308ac91623498f13
Sehee Park [Mon, 2 Jul 2018 13:46:09 +0000 (06:46 -0700)]
Merge "Modify catch when addInterfaceToLocalNetwork() is called." am:
ccd6a0f6c2
am:
c7b925063f
Change-Id: Ia160a4cf42e427575a70810d7157e092e47b5992
Sehee Park [Mon, 2 Jul 2018 13:23:35 +0000 (06:23 -0700)]
Merge "Modify catch when addInterfaceToLocalNetwork() is called."
am:
ccd6a0f6c2
Change-Id: I9842ae51d3bb4665f5cb24b7685a05de2df05097
Treehugger Robot [Mon, 2 Jul 2018 11:22:28 +0000 (11:22 +0000)]
Merge "Modify catch when addInterfaceToLocalNetwork() is called."
Sehee Park [Tue, 19 Jun 2018 11:07:37 +0000 (20:07 +0900)]
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>
SongFerng Wang [Sat, 30 Jun 2018 06:34:15 +0000 (23:34 -0700)]
Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev
am:
d7b5946628
Change-Id: I7f11346be248bd325f14d7039f5a5d5b2f45617a
SongFerng Wang [Sat, 30 Jun 2018 06:22:12 +0000 (06:22 +0000)]
Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev
Jack Yu [Sat, 30 Jun 2018 01:40:06 +0000 (18:40 -0700)]
Merge "Used APN type instead of APN id" am:
2e371c1b5a
am:
a916542011
Change-Id: I58bb518a7720e65edd73d93b5775fa4cc40b41db
SongFerngWang [Thu, 28 Jun 2018 09:28:22 +0000 (17:28 +0800)]
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
Jack Yu [Sat, 30 Jun 2018 01:06:39 +0000 (18:06 -0700)]
Merge "Used APN type instead of APN id"
am:
2e371c1b5a
Change-Id: Ib920746cb39937165aa97f79a9ac4e2fed850572
Jack Yu [Fri, 29 Jun 2018 23:54:32 +0000 (23:54 +0000)]
Merge "Used APN type instead of APN id"
Nathan Harold [Fri, 29 Jun 2018 22:46:45 +0000 (15:46 -0700)]
Merge changes I0d635067,I1424973b am:
4d7a010983
am:
3b08d8ff77
Change-Id: I323c57f0ad262a5875fcac7370dfb75d116f4bca
Nathan Harold [Fri, 29 Jun 2018 22:39:19 +0000 (15:39 -0700)]
Merge changes I0d635067,I1424973b
am:
4d7a010983
Change-Id: I4372305da9b4b6b488bdeda0ec97b412e92bce58
Jack Yu [Tue, 26 Jun 2018 00:40:02 +0000 (17:40 -0700)]
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
f42d06010a522b0d519df1a2ce9fa5ba3aefb51f)
Amit Mahajan [Fri, 29 Jun 2018 21:43:38 +0000 (14:43 -0700)]
[automerger skipped] Merge "Add new carrier config for CDMA registered PLMN when not roaming." am:
c8eb9ef591
am:
d7a5190868 -s ours
Change-Id: Id98081b344dd9bd9376adcbcff23f7d1506c35af
SongFerngWang [Fri, 29 Jun 2018 07:40:20 +0000 (15:40 +0800)]
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: I91a64d43e61c38ac1d744b99a2f8f03bbcf49deb
Nathan Harold [Fri, 29 Jun 2018 21:23:26 +0000 (21:23 +0000)]
Merge changes I0d635067,I1424973b
* changes:
Simplify equals() method of ServiceState
Update ServiceState.hashCode()
Amit Mahajan [Fri, 29 Jun 2018 21:05:51 +0000 (14:05 -0700)]
Merge "Add new carrier config for CDMA registered PLMN when not roaming."
am:
c8eb9ef591
Change-Id: I1cc5af7ab6cbb722c14b549047cccd73a5ad9720
Treehugger Robot [Fri, 29 Jun 2018 19:55:16 +0000 (19:55 +0000)]
Merge "Add new carrier config for CDMA registered PLMN when not roaming."
Lucas Dupin [Fri, 29 Jun 2018 18:40:43 +0000 (11:40 -0700)]
Merge "AOD animation polish" into pi-dev
am:
704a0d6174
Change-Id: Ia5662e819573ba45707f4f2dd4f166c64d87154e
Lucas Dupin [Fri, 29 Jun 2018 18:27:46 +0000 (18:27 +0000)]
Merge "AOD animation polish" into pi-dev
Amit Mahajan [Tue, 5 Jun 2018 23:27:32 +0000 (16:27 -0700)]
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
22e89f4773d9cbc8f5911b65b2dae3e3add7bdb6)
Amit Mahajan [Fri, 29 Jun 2018 17:34:33 +0000 (10:34 -0700)]
Merge "Add new carrier config for CDMA registered PLMN when not roaming." into pi-dev
am:
fffc308084
Change-Id: I813c193b1c9d68f524ad74d21f0616516edc18d6
TreeHugger Robot [Fri, 29 Jun 2018 17:23:13 +0000 (17:23 +0000)]
Merge "Add new carrier config for CDMA registered PLMN when not roaming." into pi-dev
Sundong Ahn [Fri, 29 Jun 2018 03:53:52 +0000 (20:53 -0700)]
Merge "Build com.android.future.usb.accessory with java_sdk_library" am:
10cfc61774
am:
35d6bafc57
Change-Id: I205f0f1811b68aa41d105fbd8db24db52ae2d35e
Remi NGUYEN VAN [Fri, 29 Jun 2018 03:44:05 +0000 (20:44 -0700)]
[automerger skipped] Merge "Disable hidden API checks on unit tests" am:
855f0f03e1 -s ours
am:
44b1914000 -s ours
Change-Id: Id6a4bb03399d46a9e709cc13e6e338d884c3b87b
Sundong Ahn [Fri, 29 Jun 2018 03:38:09 +0000 (20:38 -0700)]
Merge "Build com.android.future.usb.accessory with java_sdk_library"
am:
10cfc61774
Change-Id: Ie6abdaa1c9f58ada60da5514bbd1ed261d09fd0b
Remi NGUYEN VAN [Fri, 29 Jun 2018 03:34:19 +0000 (20:34 -0700)]
[automerger skipped] Merge "Disable hidden API checks on unit tests"
am:
855f0f03e1 -s ours
Change-Id: I9ad7743e43efd5aaa722e73ea0b2543537d23c50
Treehugger Robot [Fri, 29 Jun 2018 02:51:43 +0000 (02:51 +0000)]
Merge "Build com.android.future.usb.accessory with java_sdk_library"
Remi NGUYEN VAN [Fri, 29 Jun 2018 02:15:47 +0000 (02:15 +0000)]
Merge "Disable hidden API checks on unit tests"
Brad Ebinger [Fri, 29 Jun 2018 00:34:48 +0000 (17:34 -0700)]
Merge "Emergency SMS carrier config flag" am:
36a9fa62be
am:
86ec65e59c
Change-Id: I63df676bf2270532c84cb950e4cac13858fbd4fb
Brad Ebinger [Fri, 29 Jun 2018 00:26:39 +0000 (17:26 -0700)]
Merge "Emergency SMS carrier config flag"
am:
36a9fa62be
Change-Id: If6a2b0316ee0fdac29eedcf77686694f538d5017
Nathan Harold [Thu, 28 Jun 2018 23:36:02 +0000 (16:36 -0700)]
[automerger skipped] Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" am:
9ca4d43922 -s ours
am:
f0893a15ab -s ours
Change-Id: I039631fce137f11a1eb6d65d57f5150b50b73303
Nathan Harold [Thu, 28 Jun 2018 23:26:56 +0000 (16:26 -0700)]
[automerger skipped] Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID"
am:
9ca4d43922 -s ours
Change-Id: I2e148a4e55510acf0c0425b7e1ed6cdc1fb9eb34
Brad Ebinger [Thu, 28 Jun 2018 22:16:10 +0000 (22:16 +0000)]
Merge "Emergency SMS carrier config flag"
Nathan Harold [Thu, 28 Jun 2018 22:05:56 +0000 (22:05 +0000)]
Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID"
Siddharth Ray [Thu, 28 Jun 2018 21:46:17 +0000 (14:46 -0700)]
Merge "Fix in Wifi activity updates" into pi-dev
am:
f83e814b18
Change-Id: I7e42a65ef660029ecfc8a3bf17dac7b5beede755
TreeHugger Robot [Thu, 28 Jun 2018 21:33:24 +0000 (21:33 +0000)]
Merge "Fix in Wifi activity updates" into pi-dev
Santiago Etchebehere [Thu, 28 Jun 2018 20:18:09 +0000 (13:18 -0700)]
Merge "Force redraw after wallpaper is loaded" into pi-dev
am:
15c1e47e26
Change-Id: I7362cd3c6e351814ca090db5a6082fa09b31dd32
TreeHugger Robot [Thu, 28 Jun 2018 20:01:36 +0000 (20:01 +0000)]
Merge "Force redraw after wallpaper is loaded" into pi-dev
Nathan Harold [Tue, 26 Jun 2018 02:13:29 +0000 (19:13 -0700)]
Allow Cell Location for SYSTEM_UID and ROOT_UID
This change permits the system uid and root uid to
access cellular location information via the binder.
Previously this was restricted to the phone uid, but
running with uid=system is a privileged situation,
which makes me think this this wasn't intentional.
Also add a few lines of debug code to make issues
in LocationAccessPolicy easier to track down in the
future.
Bug:
110806860
Test: manual - ran with SL4A as SYSTEM_UID and
verified access to getAllCellInfo.
Merged-In: Ie18be2cd72c49f1859d1434428f82f164bed8756
Change-Id: Ie18be2cd72c49f1859d1434428f82f164bed8756
Lucas Dupin [Thu, 28 Jun 2018 18:09:09 +0000 (11:09 -0700)]
AOD animation polish
Change-Id: I03220e30d52aadc5aab8edddf759debd3302c95d
Fixes:
110227946
Test: visual
Matthew Ng [Thu, 28 Jun 2018 17:37:50 +0000 (10:37 -0700)]
Merge "Do not create highlight if track width is invalid" into pi-dev
am:
ed60140a93
Change-Id: I1fc23d1edd74b8aa0368da397bbdb84bac361da3
TreeHugger Robot [Thu, 28 Jun 2018 17:25:37 +0000 (17:25 +0000)]
Merge "Do not create highlight if track width is invalid" into pi-dev
Shawn Willden [Thu, 28 Jun 2018 05:16:49 +0000 (22:16 -0700)]
Merge "Correct the keystore alias used for secure imports" into pi-dev
am:
143c65d520
Change-Id: I100df017d1a6ad28cea2c6d78b1b0c55230897b3
TreeHugger Robot [Thu, 28 Jun 2018 05:07:38 +0000 (05:07 +0000)]
Merge "Correct the keystore alias used for secure imports" into pi-dev
Dan Sandler [Thu, 28 Jun 2018 04:10:03 +0000 (21:10 -0700)]
Merge "P is for PAINT." into pi-dev
am:
bed68535c0
Change-Id: Ibf1f14dea6efd09f5d2777d663bdfa69254d572d
TreeHugger Robot [Thu, 28 Jun 2018 03:49:05 +0000 (03:49 +0000)]
Merge "P is for PAINT." into pi-dev
Atanas Kirilov [Thu, 28 Jun 2018 02:15:59 +0000 (19:15 -0700)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into oc-dev am:
8b047ec8a2 am:
245cc0559f am:
0f4152e815
am:
387e0bf842
Change-Id: I6ed4b999bfc3b434971609088457aa56d042db99
Nathan Harold [Thu, 28 Jun 2018 00:21:17 +0000 (17:21 -0700)]
Simplify equals() method of ServiceState
For whatever reason, ServiceState used a
somewhat-convoluted check for null and
class type. Updating to use a canonical
and brief approach.
Bug:
8675309
Test: compilation
Change-Id: I0d635067a06093affff478e13c28bbbe2bfda7df
Atanas Kirilov [Thu, 28 Jun 2018 01:55:18 +0000 (18:55 -0700)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am:
c6dbcc137e am:
dcc95b94f8 am:
ab3235ad5b
am:
5fb8ac2010
Change-Id: I12a8c77d01f3c8655c735c9408f164f0e894f6db
Atanas Kirilov [Thu, 28 Jun 2018 01:48:55 +0000 (18:48 -0700)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into oc-dev am:
8b047ec8a2 am:
245cc0559f
am:
0f4152e815
Change-Id: I49e413e32d9db706eaa5a56fc84f9998a47b8a9e
Atanas Kirilov [Thu, 28 Jun 2018 01:45:18 +0000 (18:45 -0700)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into oc-dev am:
000036eb4c am:
00bf4c5b5c am:
2b8be3932b
am:
d63cfc9261
Change-Id: Id96bf7c84b589849d1436cb2c926df9e8d0d09dd
Atanas Kirilov [Thu, 28 Jun 2018 01:35:46 +0000 (18:35 -0700)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am:
c6dbcc137e am:
dcc95b94f8
am:
ab3235ad5b
Change-Id: I1152d43ce2eec7cd5692d61df725bcd8b455aca3
Atanas Kirilov [Thu, 28 Jun 2018 01:29:36 +0000 (18:29 -0700)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into oc-dev am:
000036eb4c am:
00bf4c5b5c
am:
2b8be3932b
Change-Id: I2ad28e6a718946be431fcda0cbb8efa719b46db3
Atanas Kirilov [Thu, 28 Jun 2018 01:27:10 +0000 (18:27 -0700)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into oc-dev am:
8b047ec8a2
am:
245cc0559f
Change-Id: I904c603cf4838f12067b9548058b85e53a843fd0
Atanas Kirilov [Thu, 28 Jun 2018 01:10:46 +0000 (18:10 -0700)]
[automerger skipped] Merge "Backporting of b/
77821568" into oc-dev am:
9774459633 am:
f3f6e2f9ee am:
1b67b798cf -s ours
am:
1028b26d46 -s ours
Change-Id: I78396616a3fa15cdf91bcee465bc4027be201898
Atanas Kirilov [Thu, 28 Jun 2018 00:57:17 +0000 (17:57 -0700)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into oc-dev
am:
8b047ec8a2
Change-Id: I0c6522feec4b1baccf3c2c8ffb0d79bdebedb9b2
Atanas Kirilov [Thu, 28 Jun 2018 00:37:57 +0000 (17:37 -0700)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am:
c6dbcc137e
am:
dcc95b94f8
Change-Id: I23209ea505140a48177b1b4fe78d36699240653e
Atanas Kirilov [Thu, 28 Jun 2018 00:25:10 +0000 (17:25 -0700)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev
am:
c6dbcc137e
Change-Id: Ib3becad73fadba2be82e44bc6fb4afc3c1921a6a
Atanas Kirilov [Thu, 28 Jun 2018 00:21:25 +0000 (17:21 -0700)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into oc-dev am:
000036eb4c
am:
00bf4c5b5c
Change-Id: I5cfc94bc9781c29a423a95a43d775e6bea6271b7
Nathan Harold [Thu, 28 Jun 2018 00:07:52 +0000 (17:07 -0700)]
Update ServiceState.hashCode()
hashCode() was missing about 10 fields and was
using some unnecessary bespoke logic to generate
hashes for individual fields. This CL simplifies
the hashCode() implementation and adds the missing
fields.
Bug:
8675309
Test: compilation
Change-Id: I1424973b11fcc6480d6f8c83d5fd0eb1b5533c7f
Atanas Kirilov [Thu, 28 Jun 2018 00:09:53 +0000 (17:09 -0700)]
[automerger skipped] Merge "Backporting of b/
77821568" into oc-dev am:
9774459633 am:
f3f6e2f9ee
am:
1b67b798cf -s ours
Change-Id: I1f209b583519e73c0912db7583b34324003a5526
Atanas Kirilov [Wed, 27 Jun 2018 23:56:45 +0000 (16:56 -0700)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into oc-dev
am:
000036eb4c
Change-Id: Ic71e3f93036902b2d9452c05e7cdb6e4df2fb0e0
Atanas Kirilov [Wed, 27 Jun 2018 23:56:36 +0000 (16:56 -0700)]
Merge "Backporting of b/
77821568" into oc-dev am:
9774459633
am:
f3f6e2f9ee
Change-Id: I1445ecb89dba24df5e89089fbf0aff308331aea0
Atanas Kirilov [Wed, 27 Jun 2018 23:42:36 +0000 (16:42 -0700)]
Merge "Backporting of b/
77821568" into oc-dev
am:
9774459633
Change-Id: Ie0d176b94d15be65918b5f67bf9ed7f49f632def
Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into oc-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am:
2f7d50058a am:
06848a3f8f skipped:
c3e741e530
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am:
2f7d50058a am:
06848a3f8f
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am:
2f7d50058a
RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing
Atanas Kirilov [Wed, 27 Jun 2018 23:26:08 +0000 (23:26 +0000)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev
Atanas Kirilov [Wed, 27 Jun 2018 23:25:42 +0000 (23:25 +0000)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into oc-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4 am:
24d402096e am:
0eda2602cd skipped:
430c4395a3
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4 am:
24d402096e am:
0eda2602cd
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4 am:
24d402096e
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c
RESTRICT AUTOMERGE: Backporting of b/
77821568
Atanas Kirilov [Wed, 27 Jun 2018 23:25:27 +0000 (23:25 +0000)]
Merge "Backporting of b/
77821568" into oc-dev
Dan Sandler [Thu, 3 May 2018 00:01:38 +0000 (20:01 -0400)]
P is for PAINT.
Bug:
109925861
Test: adb shell am start \
-a android.intent.action.MAIN \
-c com.android.internal.category.PLATLOGO
Merged-In: Ic3020007c716be264e9523d6dbae9e13a95fa571
Change-Id: Ic3020007c716be264e9523d6dbae9e13a95fa571
Siddharth Ray [Mon, 18 Jun 2018 01:28:44 +0000 (18:28 -0700)]
Fix in Wifi activity updates
When Wifi firmware resets link layer stats, it sometimes returns a value
for On time which is much larger than the duration of the report.
On time = Idle time + Rx time + Tx time.
This change prevents those errors from affecting Wifi power metrics.
BUG:
110325882
Test:
adb shell dumpsys batterystats
WiFi Scan time: 12s 302ms
WiFi Idle time: 5m 48s 634ms
WiFi Rx time: 24s 232ms
WiFi Tx time: 10s 510ms
Change-Id: I7b69fc728b275f89154dd0c1d7382576ebfadc29
Tyler Gunn [Wed, 27 Jun 2018 22:38:13 +0000 (15:38 -0700)]
Merge "ImsMultiEndPoint - Sip Notify Change" am:
af228ca978
am:
206bacb18b
Change-Id: I66364e0e5213410595ec110c422125b2c93f0411
Tyler Gunn [Wed, 27 Jun 2018 22:28:10 +0000 (15:28 -0700)]
Merge "ImsMultiEndPoint - Sip Notify Change"
am:
af228ca978
Change-Id: I49bcddccfa561ee4464ebcb2f8b07612b8e95e65
Nathan Harold [Wed, 27 Jun 2018 20:12:23 +0000 (13:12 -0700)]
Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" into stage-aosp-master
am:
998c416213
Change-Id: I352b53ac10fed126a9e585bc1d3de1430a8cff4f
Nathan Harold [Wed, 27 Jun 2018 20:02:59 +0000 (20:02 +0000)]
Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" into stage-aosp-master
Tyler Gunn [Wed, 27 Jun 2018 20:02:37 +0000 (20:02 +0000)]
Merge "ImsMultiEndPoint - Sip Notify Change"
Brad Ebinger [Wed, 27 Jun 2018 19:55:04 +0000 (12:55 -0700)]
Merge "Telephony: Introduce a base class for ISMS.aidl." am:
f03b8e2471
am:
0397b9b65d
Change-Id: Ib946404b724ddfaceae06eb5d6026137052dcb7b
Brad Ebinger [Wed, 27 Jun 2018 19:46:39 +0000 (12:46 -0700)]
Merge "Telephony: Introduce a base class for ISMS.aidl."
am:
f03b8e2471
Change-Id: I2c155c6bb46baa411f531e411f86efe0e56c20dc
Emilian Peev [Wed, 27 Jun 2018 19:34:49 +0000 (12:34 -0700)]
Merge "ImageReader: Set inverse diplay transform if needed" into pi-dev
am:
9504cd35ec
Change-Id: Ie16f3b2f24bf556ae37c4e32e869d9454578fd07
TreeHugger Robot [Wed, 27 Jun 2018 19:26:42 +0000 (19:26 +0000)]
Merge "ImageReader: Set inverse diplay transform if needed" into pi-dev
Nathan Harold [Tue, 26 Jun 2018 02:13:29 +0000 (19:13 -0700)]
Allow Cell Location for SYSTEM_UID and ROOT_UID
This change permits the system uid and root uid to
access cellular location information via the binder.
Previously this was restricted to the phone uid, but
running with uid=system is a privileged situation,
which makes me think this this wasn't intentional.
Also add a few lines of debug code to make issues
in LocationAccessPolicy easier to track down in the
future.
Bug:
110806860
Test: manual - ran with SL4A as SYSTEM_UID and
verified access to getAllCellInfo.
Change-Id: Ie18be2cd72c49f1859d1434428f82f164bed8756
Rubin Xu [Wed, 27 Jun 2018 18:40:01 +0000 (11:40 -0700)]
[automerger skipped] Merge "Support seamless handover between VPN fds." am:
9916d4b3e8 -s ours
am:
f751657ad8 -s ours
Change-Id: If474cfa932f6bff8065633a263987f3e28d64890
Tobias Thierer [Wed, 27 Jun 2018 18:31:39 +0000 (11:31 -0700)]
Merge "Track dropping of throws clause in Pattern.java." am:
251a0cfb78
am:
16de9c5a8a
Change-Id: I90eb372fc1d4bf0942cb8d072504312f50d26797
Rubin Xu [Wed, 27 Jun 2018 18:27:29 +0000 (11:27 -0700)]
[automerger skipped] Merge "Support seamless handover between VPN fds."
am:
9916d4b3e8 -s ours
Change-Id: Ieac6b403e5c242f161da56a917e55b07badc888d
Brad Ebinger [Wed, 27 Jun 2018 18:24:51 +0000 (18:24 +0000)]
Merge "Telephony: Introduce a base class for ISMS.aidl."
Tobias Thierer [Wed, 27 Jun 2018 18:21:42 +0000 (11:21 -0700)]
Merge "Track dropping of throws clause in Pattern.java."
am:
251a0cfb78
Change-Id: Icb30c1ffaba63d9f633bf45c9af2a949ddbf1fcd
Dan Sandler [Wed, 27 Jun 2018 17:06:40 +0000 (10:06 -0700)]
Activate dark theme when the UiMode is UI_MODE_NIGHT_YES.
am:
a5c846c3fa
Change-Id: Ib8020b3d649391b591a191f7ee692071bfa538d1
Rubin Xu [Wed, 27 Jun 2018 16:27:26 +0000 (16:27 +0000)]
Merge "Support seamless handover between VPN fds."
Treehugger Robot [Wed, 27 Jun 2018 16:01:14 +0000 (16:01 +0000)]
Merge "Track dropping of throws clause in Pattern.java."