OSDN Git Service
Makoto Onuki [Tue, 27 Jun 2017 20:38:38 +0000 (13:38 -0700)]
Parcel: Use @CriticalNative when possible.
- Change some methods from FastNative to CritcialNative
- Change nativeGetBlobAshmemSize to CritcalNative
- ParcelPerfTest.java (CorePerfTests)
bullhead-userdebug + prep_buller.sh, mean(ns), changed methods only
-- After
timeGetDataCapacity_mean 166 +39.16%
timeGetDataPosition_mean 169 +53.25%
timeReadByte_mean 296 +39.86%
timeReadLong_mean 284 +61.97%
timeSetDataPosition_mean 173 +34.10%
timeGetDataSize_mean 173 +37.57%
timeReadInt_mean 284 +57.04%
-- Before
timeGetDataCapacity_mean 231
timeGetDataPosition_mean 259
timeReadByte_mean 414
timeReadLong_mean 460
timeSetDataPosition_mean 232
timeGetDataSize_mean 238
timeReadInt_mean 446
Bug:
62135986
Test: bit CtsOsTestCases:android.os.cts.ParcelTest
Change-Id: I8c7ede25c87017ef2c7a49beaa3ac781c08ea365
TreeHugger Robot [Tue, 27 Jun 2017 18:41:23 +0000 (18:41 +0000)]
Merge "Add a stop user stress test"
Udam Saini [Tue, 27 Jun 2017 17:59:09 +0000 (17:59 +0000)]
Merge "Adds necessary permissions to system apis"
Tomasz Wasilczyk [Tue, 27 Jun 2017 17:31:58 +0000 (17:31 +0000)]
Merge "Fix Broadcast Radio test to not fail on HD Radio."
Tony Mak [Thu, 1 Jun 2017 10:02:59 +0000 (11:02 +0100)]
Add a stop user stress test
Start / stop user 10 times in a row, make sure the user is stopped
in a reasonable amount of time.
Test: bit FrameworksServicesTests:com.android.server.pm.UserLifecycleStressTest
Bug:
62096041
Change-Id: I7f7e460a4b50c380d9028d2b09d5cf6e279ac6f1
TreeHugger Robot [Tue, 27 Jun 2017 16:37:41 +0000 (16:37 +0000)]
Merge "Use DisplayListener instead of WindowRotationListener in AudioService."
TreeHugger Robot [Tue, 27 Jun 2017 16:15:37 +0000 (16:15 +0000)]
Merge changes Ie79ce57c,I003dd7c9,Ibb0f4504
* changes:
Assume virtual devices always have USB connection.
Allocate well-known tag for app store updates.
Add @TestApi for StrictMode tests.
TreeHugger Robot [Tue, 27 Jun 2017 16:11:37 +0000 (16:11 +0000)]
Merge "Log calling UID/PID when UriPermissions change."
Zak Cohen [Tue, 27 Jun 2017 16:00:23 +0000 (16:00 +0000)]
Merge "Don't assume device has on screen nav bar in RoundedCorners service." into oc-dr1-dev am:
d20db5a0bd
am:
a45febf1fa
Change-Id: I5f1bfd486c0ab87f8a09ee8b0283faeb5513aa7b
Zak Cohen [Tue, 27 Jun 2017 15:54:51 +0000 (15:54 +0000)]
Merge "Don't assume device has on screen nav bar in RoundedCorners service." into oc-dr1-dev
am:
d20db5a0bd
Change-Id: Idf9600ba1aa8de0a43f146425afdc9485391c12d
TreeHugger Robot [Tue, 27 Jun 2017 15:47:50 +0000 (15:47 +0000)]
Merge "Don't assume device has on screen nav bar in RoundedCorners service." into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 15:17:17 +0000 (15:17 +0000)]
Merge "Clean up USB*Manager."
Kenny Guy [Tue, 27 Jun 2017 13:16:05 +0000 (13:16 +0000)]
Merge "Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev am:
ba18b0c683 am:
9f84093386" into oc-dr1-dev-plus-aosp
am:
89244a76d3
Change-Id: I900b07e36599a27f194919a8109f2181586c1419
Kenny Guy [Tue, 27 Jun 2017 13:14:44 +0000 (13:14 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev am:
ba18b0c683 am:
8954507d8c
am:
3dce99c9ab
Change-Id: I74082e88a32ed57ee4030fa072983449005397ce
Android Build Merger (Role) [Tue, 27 Jun 2017 13:10:28 +0000 (13:10 +0000)]
Merge "Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev am:
ba18b0c683 am:
9f84093386" into oc-dr1-dev-plus-aosp
Kenny Guy [Tue, 27 Jun 2017 13:09:42 +0000 (13:09 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev am:
ba18b0c683
am:
8954507d8c
Change-Id: I4688c240fbed0e82caf114579ed2e6f5946e0ee0
Kenny Guy [Tue, 27 Jun 2017 13:09:39 +0000 (13:09 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev am:
ba18b0c683
am:
9f84093386
Change-Id: I337bdeba957957414eaad3f981488fc8d8ebbd32
Kenny Guy [Tue, 27 Jun 2017 13:04:36 +0000 (13:04 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev
am:
ba18b0c683
Change-Id: I80adc11fae6eb7ed72c1f304a560e2a5c9f93108
Kenny Guy [Tue, 27 Jun 2017 13:04:35 +0000 (13:04 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev
am:
ba18b0c683
Change-Id: Ib663cf469da3b1cc5c41b385302db3c107290d23
TreeHugger Robot [Tue, 27 Jun 2017 12:55:39 +0000 (12:55 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev
Rubin Xu [Tue, 27 Jun 2017 12:41:38 +0000 (12:41 +0000)]
Merge "Do not call into ActivityManager when holding mSpManager lock" into oc-dr1-dev am:
23ed7d7699
am:
87b90a1950
Change-Id: Ic2a320acaf707809bbff0ae54d5fa1521cadf299
Rubin Xu [Tue, 27 Jun 2017 12:36:10 +0000 (12:36 +0000)]
Merge "Do not call into ActivityManager when holding mSpManager lock" into oc-dr1-dev
am:
23ed7d7699
Change-Id: I5a1315765c6b0dca3c7ffca914a56a34bffd0f44
TreeHugger Robot [Tue, 27 Jun 2017 12:28:47 +0000 (12:28 +0000)]
Merge "Do not call into ActivityManager when holding mSpManager lock" into oc-dr1-dev
Neil Fuller [Tue, 27 Jun 2017 12:21:37 +0000 (12:21 +0000)]
Merge "Switch to streaming data for time zone update" am:
f093d4e13e am:
4fee968fa8 am:
dbe6beb0bb
am:
90b6995cd2
Change-Id: I24e9d58e1736d791dca26e124b714c98ef1f3914
Neil Fuller [Tue, 27 Jun 2017 12:16:20 +0000 (12:16 +0000)]
Merge "Switch to streaming data for time zone update" am:
f093d4e13e am:
4fee968fa8
am:
dbe6beb0bb
Change-Id: Ie3c352bc87cf6cd74a1e073efe4a99b518b133e4
Neil Fuller [Tue, 27 Jun 2017 12:10:37 +0000 (12:10 +0000)]
Merge "Switch to streaming data for time zone update" am:
f093d4e13e
am:
4fee968fa8
Change-Id: I042861293371d07f62b05b28dc7c3a2ffb090812
Neil Fuller [Tue, 27 Jun 2017 12:05:17 +0000 (12:05 +0000)]
Merge "Switch to streaming data for time zone update"
am:
f093d4e13e
Change-Id: I3fd22fe47e1d7b86d4f88d527940c6812ecfa31b
Neil Fuller [Tue, 27 Jun 2017 11:56:53 +0000 (11:56 +0000)]
Merge "Switch to streaming data for time zone update"
Paul Duffin [Tue, 27 Jun 2017 11:49:35 +0000 (11:49 +0000)]
Merge "Clean up Predicate related code in android.test" am:
1230b249f1 -s ours am:
1cd40dac5c am:
8e6690f35a
am:
30a1f0eb8c
Change-Id: Ic45017c7f48eb9baa2dceaf4504b6f8a2d8f081d
Julius D'souza [Tue, 27 Jun 2017 11:43:22 +0000 (11:43 +0000)]
Merge "Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours am:
8af046a55e -s ours am:
af8e230787 am:
889d326eda" into oc-dr1-dev-plus-aosp
am:
3b7277efeb
Change-Id: I082d86f8e65b339f4dd9d7b62b32a8622b86a72f
Paul Duffin [Tue, 27 Jun 2017 11:41:44 +0000 (11:41 +0000)]
Merge "Clean up Predicate related code in android.test" am:
1230b249f1 -s ours am:
1cd40dac5c
am:
8e6690f35a
Change-Id: If29cf2a91dc5d91a50aa7d51604f0a054fce352a
Julius D'souza [Tue, 27 Jun 2017 11:41:36 +0000 (11:41 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours am:
8af046a55e -s ours am:
af8e230787 am:
fe26fadf97
am:
9fa68b6bc5
Change-Id: Ifabc90ad9a4b4b4b6bea64ba1f57bfa5ca1197ca
Android Build Merger (Role) [Tue, 27 Jun 2017 11:36:20 +0000 (11:36 +0000)]
Merge "Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours am:
8af046a55e -s ours am:
af8e230787 am:
889d326eda" into oc-dr1-dev-plus-aosp
Julius D'souza [Tue, 27 Jun 2017 11:35:13 +0000 (11:35 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours am:
8af046a55e -s ours am:
af8e230787
am:
889d326eda
Change-Id: I23af9d8a67d862b6d72ac41408926085bd8ef4a7
Julius D'souza [Tue, 27 Jun 2017 11:35:04 +0000 (11:35 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours am:
8af046a55e -s ours am:
af8e230787
am:
fe26fadf97
Change-Id: I5ee1baf2285f4efb000f8077377313d367325264
Paul Duffin [Tue, 27 Jun 2017 11:34:01 +0000 (11:34 +0000)]
Merge "Clean up Predicate related code in android.test" am:
1230b249f1 -s ours
am:
1cd40dac5c
Change-Id: Idde6b4548f44eefb5633ee88f1a497b72f7d7f42
Julius D'souza [Tue, 27 Jun 2017 11:30:00 +0000 (11:30 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours am:
8af046a55e -s ours
am:
af8e230787
Change-Id: I26adc1561e90d9eeca58bb130c2c137e6fea9f40
Julius D'souza [Tue, 27 Jun 2017 11:29:58 +0000 (11:29 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours am:
8af046a55e -s ours
am:
af8e230787
Change-Id: Ifc935d4b6a9f8eccf26882130ef994288ea23e64
Paul Duffin [Tue, 27 Jun 2017 11:27:41 +0000 (11:27 +0000)]
Merge "Clean up Predicate related code in android.test"
am:
1230b249f1 -s ours
Change-Id: I4836793deccd83e06129ad18035f4f4acf5f8617
Julius D'souza [Tue, 27 Jun 2017 11:25:01 +0000 (11:25 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours
am:
8af046a55e -s ours
Change-Id: I6535c07aaf3a62db028da439ead2172c756ef63f
Julius D'souza [Tue, 27 Jun 2017 11:19:01 +0000 (11:19 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev
am:
fef074ad29 -s ours
Change-Id: I9e6702dc1e7f9dd875f39cfa61bccdb9dfe117a1
Paul Duffin [Tue, 27 Jun 2017 11:09:09 +0000 (11:09 +0000)]
Merge "Clean up ClassPathPackageInfoSource" am:
8c7026c5a3 am:
1c6a5ad92e am:
88d54c3080
am:
06620ee22d
Change-Id: I1a4de01fe23a03b42c052f23733d95e07135ab73
Julius D'souza [Tue, 27 Jun 2017 11:06:40 +0000 (11:06 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev
Paul Duffin [Tue, 27 Jun 2017 11:03:11 +0000 (11:03 +0000)]
Merge "Clean up ClassPathPackageInfoSource" am:
8c7026c5a3 am:
1c6a5ad92e
am:
88d54c3080
Change-Id: I3716fc728a6789a33851f4f0ad30a3ad9f421a17
Paul Duffin [Tue, 27 Jun 2017 10:57:34 +0000 (10:57 +0000)]
Merge "Clean up ClassPathPackageInfoSource" am:
8c7026c5a3
am:
1c6a5ad92e
Change-Id: I5f24e0e8a5b4c592e60e749df66df3908d1620f5
Paul Duffin [Tue, 27 Jun 2017 10:52:39 +0000 (10:52 +0000)]
Merge "Clean up ClassPathPackageInfoSource"
am:
8c7026c5a3
Change-Id: I503ae16c4d47ce3cecb79987da919c7f579347da
Paul Duffin [Tue, 27 Jun 2017 10:42:56 +0000 (10:42 +0000)]
Merge "Clean up Predicate related code in android.test"
Paul Duffin [Tue, 27 Jun 2017 10:42:51 +0000 (10:42 +0000)]
Merge "Clean up ClassPathPackageInfoSource"
Kenny Guy [Mon, 26 Jun 2017 18:13:56 +0000 (19:13 +0100)]
Fix deadlock in NetworkLoggingHandler
Stop NetworkLoggingHandler holding a lock
when calling back into DevicePolicyManagerService.
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithTwoUsers
Bug:
62966480
Change-Id: I41c3edca8922008a9d838d71ddcc50883699bc74
Pavel Grafov [Tue, 27 Jun 2017 10:28:02 +0000 (10:28 +0000)]
Merge "Add credential verification command to locksetting."
Selim Cinek [Tue, 27 Jun 2017 10:11:56 +0000 (10:11 +0000)]
Merge "Merge "Fixed an accessibility issue with the pin view" into oc-dev am:
06fdcf8a40 am:
656c1105f6" into oc-dr1-dev-plus-aosp
am:
0ee8c0357a
Change-Id: I28ab82aa34e3e401748c1ce9874c394c0fc75633
Selim Cinek [Tue, 27 Jun 2017 10:10:29 +0000 (10:10 +0000)]
Merge "Fixed an accessibility issue with the pin view" into oc-dev am:
06fdcf8a40 am:
1d9c84b39b
am:
dddc362bc9
Change-Id: Ie5ca3300ff77bb925c62bba109eda8d839398c22
Android Build Merger (Role) [Tue, 27 Jun 2017 10:06:27 +0000 (10:06 +0000)]
Merge "Merge "Fixed an accessibility issue with the pin view" into oc-dev am:
06fdcf8a40 am:
656c1105f6" into oc-dr1-dev-plus-aosp
Selim Cinek [Tue, 27 Jun 2017 10:05:26 +0000 (10:05 +0000)]
Merge "Fixed an accessibility issue with the pin view" into oc-dev am:
06fdcf8a40
am:
656c1105f6
Change-Id: I1102ed0d33c2497b069e2285f097f6bfbe8b5685
Selim Cinek [Tue, 27 Jun 2017 10:05:25 +0000 (10:05 +0000)]
Merge "Fixed an accessibility issue with the pin view" into oc-dev am:
06fdcf8a40
am:
1d9c84b39b
Change-Id: Ia7b2b47db9368348d5a7319f67944fb421cc00d5
Selim Cinek [Tue, 27 Jun 2017 10:00:35 +0000 (10:00 +0000)]
Merge "Fixed an accessibility issue with the pin view" into oc-dev
am:
06fdcf8a40
Change-Id: Ifba5dcd771b7156f9e12bb1a2b9311241850ba8c
Selim Cinek [Tue, 27 Jun 2017 10:00:34 +0000 (10:00 +0000)]
Merge "Fixed an accessibility issue with the pin view" into oc-dev
am:
06fdcf8a40
Change-Id: Ife4c2d8eb5a7146a46b8cc8d088442b5e0790949
TreeHugger Robot [Tue, 27 Jun 2017 09:54:20 +0000 (09:54 +0000)]
Merge "Fixed an accessibility issue with the pin view" into oc-dev
Bryce Lee [Tue, 27 Jun 2017 04:33:15 +0000 (04:33 +0000)]
Merge "Merge "Add aborted start result." into oc-dev am:
8796c20dae am:
0259473b75" into oc-dr1-dev-plus-aosp
am:
57668dee77
Change-Id: I982363bf6dab1b9d8653ab2a80367d40d024639b
Bryce Lee [Tue, 27 Jun 2017 04:31:39 +0000 (04:31 +0000)]
Merge "Add aborted start result." into oc-dev am:
8796c20dae am:
943794bb70
am:
ee289616fb
Change-Id: I1b69a9fb813e2cab1a3c8b496ea5b753cdf3abe6
Android Build Merger (Role) [Tue, 27 Jun 2017 04:28:04 +0000 (04:28 +0000)]
Merge "Merge "Add aborted start result." into oc-dev am:
8796c20dae am:
0259473b75" into oc-dr1-dev-plus-aosp
Bryce Lee [Tue, 27 Jun 2017 04:27:08 +0000 (04:27 +0000)]
Merge "Add aborted start result." into oc-dev am:
8796c20dae
am:
943794bb70
Change-Id: I9bf7aa7a5b1e8fbf7ccdea5a883c0ce98fa8f3ff
Bryce Lee [Tue, 27 Jun 2017 04:27:05 +0000 (04:27 +0000)]
Merge "Add aborted start result." into oc-dev am:
8796c20dae
am:
0259473b75
Change-Id: I3d42c1c1136740c1f89608391141ac5f35f1fce8
Bryce Lee [Tue, 27 Jun 2017 04:20:35 +0000 (04:20 +0000)]
Merge "Add aborted start result." into oc-dev
am:
8796c20dae
Change-Id: I849ea5bfce87bd6a9264308e40242f6a2026713c
Bryce Lee [Tue, 27 Jun 2017 04:20:34 +0000 (04:20 +0000)]
Merge "Add aborted start result." into oc-dev
am:
8796c20dae
Change-Id: I893c429db5c71747fda8e390ee7d9d786ce0c53a
Bryce Lee [Tue, 27 Jun 2017 04:14:20 +0000 (04:14 +0000)]
Merge "Add aborted start result." into oc-dev
Chris Craik [Tue, 27 Jun 2017 02:08:00 +0000 (02:08 +0000)]
Merge "Use NativeAllocationRegistry for ColorFilter" into oc-dr1-dev am:
049543b771
am:
bc1db397eb
Change-Id: I76e107bbbb89e32f535324f393c8f4ad3341bed3
Chris Craik [Tue, 27 Jun 2017 02:04:04 +0000 (02:04 +0000)]
Merge "Use NativeAllocationRegistry for ColorFilter" into oc-dr1-dev
am:
049543b771
Change-Id: I10712da29d0c84d2aa462bf892857e27c73f273b
TreeHugger Robot [Tue, 27 Jun 2017 01:59:24 +0000 (01:59 +0000)]
Merge "Use NativeAllocationRegistry for ColorFilter" into oc-dr1-dev
Jeff Sharkey [Tue, 27 Jun 2017 01:57:16 +0000 (19:57 -0600)]
Assume virtual devices always have USB connection.
We use the presence of an active USB data connection to suppress
the RescueParty logic. For example, all physical devices in a test
lab return "true" here to avoid interfering with test results.
Since virtual devices are pretty much only used in test labs, return
true for them too.
Bug:
37347800
Test: builds, boots
Change-Id: Ie79ce57ce67fb78234c1001a593918253a85254d
Jeff Sharkey [Tue, 27 Jun 2017 01:50:41 +0000 (19:50 -0600)]
Allocate well-known tag for app store updates.
This way an app store can shift blame for update-related network
traffic onto the app that is being updated.
Using a well-known tag makes it easy for developers to identify
that they didn't explicitly request the traffic at runtime, similar
to how backup/restore traffic is handled.
Bug:
38282350
Test: builds, boots
Change-Id: I003dd7c9615d4ab318250f1e44fa5d195ac94d23
Jeff Sharkey [Tue, 27 Jun 2017 01:38:56 +0000 (19:38 -0600)]
Add @TestApi for StrictMode tests.
Bug:
62037127
Test: builds, boots
Change-Id: Ibb0f450400bc498c2b4d4fe3399c7e4d573eef60
Shishir Agrawal [Tue, 27 Jun 2017 01:34:30 +0000 (01:34 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dr1-dev am:
aef55ec08b
am:
0dfc48490d
Change-Id: Ief4f6d258163ddd69d0cf9799c6118d5979fbf59
Jeff Sharkey [Tue, 27 Jun 2017 01:34:04 +0000 (19:34 -0600)]
Log calling UID/PID when UriPermissions change.
Helps debug who is requesting the change.
Bug:
62432749
Test: adb shell setprop log.tag.UriPermission VERBOSE
Change-Id: I3c721cc4fe07141117346ef519f18a63c5398bda
Shishir Agrawal [Tue, 27 Jun 2017 01:30:00 +0000 (01:30 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dr1-dev
am:
aef55ec08b
Change-Id: If0cfd58dcd93a2b4d0f128cfcfcff7cac451ea35
Shishir Agrawal [Tue, 27 Jun 2017 01:23:07 +0000 (01:23 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dr1-dev
Jeff Davidson [Tue, 27 Jun 2017 01:00:05 +0000 (01:00 +0000)]
Merge "Pass calling package to resolution UI." into oc-dr1-dev am:
776220d029
am:
f60773b22d
Change-Id: I4d21f823af658701f7ffda1671d22eeee761cb57
Jeff Davidson [Tue, 27 Jun 2017 00:53:58 +0000 (00:53 +0000)]
Merge "Pass calling package to resolution UI." into oc-dr1-dev
am:
776220d029
Change-Id: I9896d70fea9d69025c1a77d634333d160a71acb6
TreeHugger Robot [Tue, 27 Jun 2017 00:50:51 +0000 (00:50 +0000)]
Merge "Fixed focus navigation on bugreport dialog."
TreeHugger Robot [Tue, 27 Jun 2017 00:48:33 +0000 (00:48 +0000)]
Merge "Pass calling package to resolution UI." into oc-dr1-dev
Phil Weaver [Tue, 27 Jun 2017 00:39:23 +0000 (00:39 +0000)]
Merge "Clean up popup window titles"
Makoto Onuki [Tue, 27 Jun 2017 00:38:12 +0000 (00:38 +0000)]
Merge "Whitelist ACTION_QUICK_CONTACT from StrictMode.onFileUriExposed" into oc-dr1-dev am:
c4ccefc7fd
am:
bb55e3e2e4
Change-Id: I98a0ff03f1de40e3092da47eaae2a3febfe1bd60
Makoto Onuki [Tue, 27 Jun 2017 00:36:56 +0000 (00:36 +0000)]
Merge "Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am:
9f607f4c0b am:
36520c229f" into oc-dr1-dev-plus-aosp
am:
bd1d8bf4c2
Change-Id: I770e8c209a9885685c1415cbb4a3c6a2ccb37e44
Makoto Onuki [Tue, 27 Jun 2017 00:35:31 +0000 (00:35 +0000)]
Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am:
9f607f4c0b am:
eb63919bc4
am:
9b723d886e
Change-Id: If824cafb12f37555fc433512d1fd02ab107f4355
Ying Xu [Tue, 27 Jun 2017 00:34:09 +0000 (00:34 +0000)]
Merge "Fix the inconsistency of scan status." into oc-dr1-dev am:
231e291b06 -s ours
am:
cb758f46ba -s ours
Change-Id: I8237389f9e1bd2223f488ae642500bc664704c23
Sean Lu [Tue, 27 Jun 2017 00:33:00 +0000 (00:33 +0000)]
Merge "[Resources] house keeping in TypeList" am:
ff2e03cfce am:
516bd5f862 am:
2d604852ce
am:
5386fcf965
Change-Id: Iafa12b6189d9b97354adcff2a481602db9522c48
Marco Nelissen [Tue, 27 Jun 2017 00:31:33 +0000 (00:31 +0000)]
Merge "Revert "Multiple worker threads for SoundPool"" into oc-dr1-dev am:
59a66b8601
am:
b0bb373286
Change-Id: I859b99e3dc68396abccc0f399004860042d6cb07
Evan Laird [Tue, 27 Jun 2017 00:30:10 +0000 (00:30 +0000)]
Merge "Use BatteryMeterDrawableBase as QS icon for Battery Saver" into oc-dr1-dev am:
be196018e1
am:
fdef07d9fe
Change-Id: I8d8b1f126ed3a7690cc09d9fc38f12583210b407
Udam Saini [Wed, 7 Jun 2017 19:06:28 +0000 (12:06 -0700)]
Adds necessary permissions to system apis
adds privileged permission for getCaptivePortalServerUrl
adds tether privileged permission for
startTethering,isTetheringSupported
bug:
62348162
Test: make and manual testing
Change-Id: I8eb8e3c9dcd7201abe9ea303ee57fe99073d67eb
Zak Cohen [Tue, 27 Jun 2017 00:22:45 +0000 (17:22 -0700)]
Don't assume device has on screen nav bar in RoundedCorners service.
Bug:
63039412
Test: manual
Change-Id: I9af3e1fb9d831dfb988c88b8ef78a52f2af4bef0
Makoto Onuki [Mon, 26 Jun 2017 23:53:00 +0000 (23:53 +0000)]
Merge "Whitelist ACTION_QUICK_CONTACT from StrictMode.onFileUriExposed" into oc-dr1-dev
am:
c4ccefc7fd
Change-Id: I2701f1fc12d487d23200ef8e5509535656fe27fe
TreeHugger Robot [Mon, 26 Jun 2017 23:49:00 +0000 (23:49 +0000)]
Merge "Whitelist ACTION_QUICK_CONTACT from StrictMode.onFileUriExposed" into oc-dr1-dev
Android Build Merger (Role) [Mon, 26 Jun 2017 23:37:58 +0000 (23:37 +0000)]
Merge "Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am:
9f607f4c0b am:
36520c229f" into oc-dr1-dev-plus-aosp
Makoto Onuki [Mon, 26 Jun 2017 23:36:54 +0000 (23:36 +0000)]
Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am:
9f607f4c0b
am:
36520c229f
Change-Id: I1cea2e7016ec5a1bf3b3411d7cbb389db150aeef
Makoto Onuki [Mon, 26 Jun 2017 23:36:48 +0000 (23:36 +0000)]
Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am:
9f607f4c0b
am:
eb63919bc4
Change-Id: Ie035bcafa71e4b8d2e2e839212b001dc4c1d00f7
Makoto Onuki [Mon, 26 Jun 2017 23:31:59 +0000 (23:31 +0000)]
Merge "Fix activity icon badging for non-bitmap icons" into oc-dev
am:
9f607f4c0b
Change-Id: Ie8b426c14fa30b7c2f5eadc5818e1dfd16f8c0a5
Makoto Onuki [Mon, 26 Jun 2017 23:31:56 +0000 (23:31 +0000)]
Merge "Fix activity icon badging for non-bitmap icons" into oc-dev
am:
9f607f4c0b
Change-Id: Iddf617784c20bfd835413e934071aea3b02d5d6c
Bryce Lee [Mon, 26 Jun 2017 23:27:32 +0000 (16:27 -0700)]
Add aborted start result.
Previously, we were returning START_SUCCESS when ActivityStarter
aborted launching the activity. This hides this activity and makes it
harder to debug.
This CL adds a new start result type to capture this internally.
Bug:
38121026
Test: manual
Test: go/wm-smoke
Change-Id: I97699b22b1eff476724c48db0c29daa0566ad280
TreeHugger Robot [Mon, 26 Jun 2017 23:25:10 +0000 (23:25 +0000)]
Merge "Fix activity icon badging for non-bitmap icons" into oc-dev
Ying Xu [Mon, 26 Jun 2017 23:15:58 +0000 (23:15 +0000)]
Merge "Fix the inconsistency of scan status." into oc-dr1-dev
am:
231e291b06 -s ours
Change-Id: I5faaa2f7589ceaa68bf7ae21c065e2dce0621286
OSDN Git Service
