OSDN Git Service
Wale Ogunwale [Thu, 8 Jun 2017 14:52:26 +0000 (14:52 +0000)]
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev am:
13059cc2ad
am:
bc4f4e5be6
Change-Id: I9877ba7613b9a41cb2b48df2ab0ac49be460961d
Wale Ogunwale [Thu, 8 Jun 2017 14:41:34 +0000 (14:41 +0000)]
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
am:
13059cc2ad
Change-Id: I079d34636465188b0d2bd231c798c44343bbc3b5
Wale Ogunwale [Thu, 8 Jun 2017 14:33:03 +0000 (14:33 +0000)]
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
Android Build Merger (Role) [Thu, 8 Jun 2017 14:26:14 +0000 (14:26 +0000)]
Merge "Merge "Fixed a bug where the navigation notification would flicker" into oc-dev am:
b18f65a168 am:
ef711976c8" into oc-dr1-dev-plus-aosp
Selim Cinek [Thu, 8 Jun 2017 14:23:29 +0000 (14:23 +0000)]
Merge "Fixed a bug where the navigation notification would flicker" into oc-dev am:
b18f65a168
am:
1c28e96bf0
Change-Id: I68ac5b61d9e943346a62ed72fffe5650ce9cd2dd
Selim Cinek [Thu, 8 Jun 2017 14:23:27 +0000 (14:23 +0000)]
Merge "Fixed a bug where the navigation notification would flicker" into oc-dev am:
b18f65a168
am:
ef711976c8
Change-Id: I8cf63a193d9b4cbf1cf62b48f051849d4e7158af
Selim Cinek [Thu, 8 Jun 2017 14:15:33 +0000 (14:15 +0000)]
Merge "Fixed a bug where the navigation notification would flicker" into oc-dev
am:
b18f65a168
Change-Id: I53abb4f31f8dc660ba9b140475bbd121df524613
Selim Cinek [Thu, 8 Jun 2017 14:15:29 +0000 (14:15 +0000)]
Merge "Fixed a bug where the navigation notification would flicker" into oc-dev
am:
b18f65a168
Change-Id: I385374ede44f09bb729ec7df7be13dc62c19bb2a
Selim Cinek [Thu, 8 Jun 2017 14:07:14 +0000 (14:07 +0000)]
Merge "Fixed a bug where the navigation notification would flicker" into oc-dev
Android Build Merger (Role) [Thu, 8 Jun 2017 13:43:53 +0000 (13:43 +0000)]
Merge "Delete legacy "wifi interface name guessing" behaviour am:
9e22554068 am:
998e766acc" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 8 Jun 2017 13:40:56 +0000 (13:40 +0000)]
Delete legacy "wifi interface name guessing" behaviour am:
9e22554068
am:
998e766acc
Change-Id: I7c4f88c27fae3a5d3730822a4ed25fdb2afaeeac
Erik Kline [Thu, 8 Jun 2017 13:40:54 +0000 (13:40 +0000)]
Delete legacy "wifi interface name guessing" behaviour am:
9e22554068
am:
e7d7699381
Change-Id: Iddfd2e5f81b80f311896e8eb4019d7ebd7c1c1c0
Erik Kline [Thu, 8 Jun 2017 13:32:57 +0000 (13:32 +0000)]
Delete legacy "wifi interface name guessing" behaviour
am:
9e22554068
Change-Id: Iecb4498c004a45403213d6e4bd7b6f8725334646
Erik Kline [Thu, 8 Jun 2017 13:32:53 +0000 (13:32 +0000)]
Delete legacy "wifi interface name guessing" behaviour
am:
9e22554068
Change-Id: I25e3814f979dbe65055498c85b34411cf6d3c996
Erik Kline [Thu, 8 Jun 2017 12:28:58 +0000 (12:28 +0000)]
Merge "Move findPreferredUpstreamType into UNM" am:
32703994fe am:
8bc87070f9
am:
ad652cbcf3
Change-Id: Ifa1a34a1fb32149085421a63cb0f2586d2862d6b
Erik Kline [Thu, 8 Jun 2017 12:20:31 +0000 (12:20 +0000)]
Merge "Move findPreferredUpstreamType into UNM" am:
32703994fe
am:
8bc87070f9
Change-Id: Ia215e55b69b856f5511e5d4f852e39fa6c11462e
Erik Kline [Thu, 8 Jun 2017 12:11:59 +0000 (12:11 +0000)]
Merge "Move findPreferredUpstreamType into UNM"
am:
32703994fe
Change-Id: I20e90906e72bc8bba9f0f535d54ba430f96191ff
Treehugger Robot [Thu, 8 Jun 2017 12:02:59 +0000 (12:02 +0000)]
Merge "Move findPreferredUpstreamType into UNM"
Erik Kline [Thu, 8 Jun 2017 08:48:48 +0000 (17:48 +0900)]
Delete legacy "wifi interface name guessing" behaviour
Now that Wi-Fi always passes us the AP interface name (and mode)
we no longer need to guess which interface on which we're supposed
to be starting IP serving (either tethering or local-only hotspot).
Test: as follows
- built
- flashed
- booted
- TetheringTest passes
Bug:
32163131
Bug:
62343300
Change-Id: I6019410ee5adff4929690d35ba09294765fcd6a4
Erik Kline [Mon, 5 Jun 2017 07:02:02 +0000 (16:02 +0900)]
Move findPreferredUpstreamType into UNM
This changes the way in which available networks are found. Previously
Tethering asked ConnectivityService for NetworkInfo and checked for
whether or not it was in state CONNECTED.
Here we use the fact that ConnectivityService will not call UNM's
callbacks' onAvailable() methods until the networks in question have
become connected.
Test: as follows
- built
- flashed
- booted
- runtest framework-net passed
Bug:
32163131
Change-Id: I97abe225fdd3accb38bd9168f545445b761a90d8
Android Build Merger (Role) [Thu, 8 Jun 2017 06:26:07 +0000 (06:26 +0000)]
Merge "Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am:
9be8c96918 am:
07d2221218" into oc-dr1-dev-plus-aosp
Felipe Leme [Thu, 8 Jun 2017 06:20:24 +0000 (06:20 +0000)]
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am:
9be8c96918
am:
07d2221218
Change-Id: If47f67c7bf291e44015c92708eca0ff00a2a14b8
Android Build Merger (Role) [Thu, 8 Jun 2017 06:19:59 +0000 (06:19 +0000)]
Merge "Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am:
3492ed4376 am:
53bdeb1a46" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 8 Jun 2017 06:19:27 +0000 (06:19 +0000)]
Merge "Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am:
9be8c96918 am:
4d579eacec" into oc-dr1-dev-plus-aosp
Mark Rathjen [Thu, 8 Jun 2017 06:19:10 +0000 (06:19 +0000)]
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am:
3492ed4376
am:
53bdeb1a46
Change-Id: If4ba8d279d1bafbcb606f703a0f7498954c73e62
Felipe Leme [Thu, 8 Jun 2017 06:18:37 +0000 (06:18 +0000)]
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am:
9be8c96918
am:
4d579eacec
Change-Id: I5824d83e8a5043766aa062ff023d5ad82be28d28
Yuchen He [Thu, 8 Jun 2017 06:17:14 +0000 (06:17 +0000)]
Merge "Fix AeModeAndLock test cases. Bug:
36103813" into oc-dev am:
3671e9249b
am:
c592c63a2d
Change-Id: If1a4ac40d340b9bd59fda0924bbbc313dbe810c1
Android Build Merger (Role) [Thu, 8 Jun 2017 06:14:49 +0000 (06:14 +0000)]
Merge "Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am:
3492ed4376 am:
d88c71a6e2" into oc-dr1-dev-plus-aosp
Mark Rathjen [Thu, 8 Jun 2017 06:14:00 +0000 (06:14 +0000)]
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am:
3492ed4376
am:
d88c71a6e2
Change-Id: Ic6204047cd677b339ff3de0ba74e6b194086ea11
Android Build Merger (Role) [Thu, 8 Jun 2017 06:13:35 +0000 (06:13 +0000)]
Merge "Merge "Fix AeModeAndLock test cases. Bug:
36103813" into oc-dev am:
3671e9249b am:
43f1ee3ac8" into oc-dr1-dev-plus-aosp
Yuchen He [Thu, 8 Jun 2017 06:12:35 +0000 (06:12 +0000)]
Merge "Fix AeModeAndLock test cases. Bug:
36103813" into oc-dev am:
3671e9249b
am:
43f1ee3ac8
Change-Id: Ic0fb208b3b556269c24c8a6e8a557edf8bd917d4
Android Build Merger (Role) [Thu, 8 Jun 2017 06:12:06 +0000 (06:12 +0000)]
Merge "Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am:
6029bce3b4 am:
0fcadeaeb9" into oc-dr1-dev-plus-aosp
Adam Bookatz [Thu, 8 Jun 2017 06:09:46 +0000 (06:09 +0000)]
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am:
6029bce3b4
am:
0fcadeaeb9
Change-Id: Ieb7b6cd5299bab7f10c84f78e8ae1472988cff60
Andreas Gampe [Thu, 8 Jun 2017 06:08:30 +0000 (06:08 +0000)]
Merge "Framework: Remove SamplingProfiler" am:
d2ecee2506 am:
3ea0309e39 -s ours
am:
76f6da62e6 -s ours
Change-Id: If989c3990ed4570ba0feb09a62ecf3e6359d9c0f
Felipe Leme [Thu, 8 Jun 2017 06:07:15 +0000 (06:07 +0000)]
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
am:
9be8c96918
Change-Id: Ib165e14765a74e77fd41d15d979bf7f7ac0726ed
Android Build Merger (Role) [Thu, 8 Jun 2017 06:05:33 +0000 (06:05 +0000)]
Merge "Merge changes Iea24e5a1,If71385bc into oc-dev am:
3834421c96 am:
23e5a1ee65" into oc-dr1-dev-plus-aosp
Mark Rathjen [Thu, 8 Jun 2017 06:04:54 +0000 (06:04 +0000)]
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
am:
3492ed4376
Change-Id: I49015844829d55a903437a807b345688794002b5
Todd Kennedy [Thu, 8 Jun 2017 06:04:42 +0000 (06:04 +0000)]
Merge changes Iea24e5a1,If71385bc into oc-dev am:
3834421c96
am:
23e5a1ee65
Change-Id: If4f55496f91c671545796f774d7ed5031b97ef86
Android Build Merger (Role) [Thu, 8 Jun 2017 06:04:13 +0000 (06:04 +0000)]
Merge "Merge "Confirm a11y shortcut service for correct user" into oc-dev am:
03a5b3a509 am:
7c44479edf" into oc-dr1-dev-plus-aosp
Phil Weaver [Thu, 8 Jun 2017 06:03:29 +0000 (06:03 +0000)]
Merge "Confirm a11y shortcut service for correct user" into oc-dev am:
03a5b3a509
am:
7c44479edf
Change-Id: Ia25a60f70dd172a7c8dfe5c17e72bdf193b0d3f0
Android Build Merger (Role) [Thu, 8 Jun 2017 06:03:01 +0000 (06:03 +0000)]
Merge "Merge "Passing callingUid to internal methods" into oc-dev am:
dacdf2e978 am:
de066fd249" into oc-dr1-dev-plus-aosp
Todd Kennedy [Thu, 8 Jun 2017 06:02:07 +0000 (06:02 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev am:
dacdf2e978
am:
de066fd249
Change-Id: Ic66a91417dabf23ee798f5f38696e6fe543e9803
Yuchen He [Thu, 8 Jun 2017 06:01:50 +0000 (06:01 +0000)]
Merge "Fix AeModeAndLock test cases. Bug:
36103813" into oc-dev
am:
3671e9249b
Change-Id: I0a9c3a30877d1aa54cc45a67abcd4444eebf63c4
Android Build Merger (Role) [Thu, 8 Jun 2017 06:01:36 +0000 (06:01 +0000)]
Merge "Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am:
6029bce3b4 am:
300ebee8c4" into oc-dr1-dev-plus-aosp
Adam Bookatz [Thu, 8 Jun 2017 06:00:42 +0000 (06:00 +0000)]
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am:
6029bce3b4
am:
300ebee8c4
Change-Id: I0ae48f45c0debbe2e875ab123491c09bea265c3e
Android Build Merger (Role) [Thu, 8 Jun 2017 06:00:13 +0000 (06:00 +0000)]
Merge "Merge changes Iea24e5a1,If71385bc into oc-dev am:
3834421c96 am:
4d2a9a9f50" into oc-dr1-dev-plus-aosp
Adam Bookatz [Thu, 8 Jun 2017 05:59:56 +0000 (05:59 +0000)]
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
am:
6029bce3b4
Change-Id: Ib8292cc59afe1933bad8d48907ad47c46bb73e87
Todd Kennedy [Thu, 8 Jun 2017 05:59:13 +0000 (05:59 +0000)]
Merge changes Iea24e5a1,If71385bc into oc-dev am:
3834421c96
am:
4d2a9a9f50
Change-Id: Idceec36ea86ae6b00adb3ee24bbb08c3116403ce
Android Build Merger (Role) [Thu, 8 Jun 2017 05:58:47 +0000 (05:58 +0000)]
Merge "Merge "Confirm a11y shortcut service for correct user" into oc-dev am:
03a5b3a509 am:
3d5bf99e7f" into oc-dr1-dev-plus-aosp
Phil Weaver [Thu, 8 Jun 2017 05:57:56 +0000 (05:57 +0000)]
Merge "Confirm a11y shortcut service for correct user" into oc-dev am:
03a5b3a509
am:
3d5bf99e7f
Change-Id: I7649712f41a7746acd21382e651e45fecf67a0cf
Android Build Merger (Role) [Thu, 8 Jun 2017 05:57:26 +0000 (05:57 +0000)]
Merge "Merge "Embms download setup" am:
da5b77fa9b am:
a807ee8f1c am:
b6a16546b5" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 8 Jun 2017 05:56:24 +0000 (05:56 +0000)]
Merge "Merge "Add timeout to StrictMode flash." into oc-dev am:
fdb3d31504 am:
13e4dfdceb" into oc-dr1-dev-plus-aosp
Hall Liu [Thu, 8 Jun 2017 05:55:56 +0000 (05:55 +0000)]
Merge "Embms download setup" am:
da5b77fa9b am:
a807ee8f1c
am:
b6a16546b5
Change-Id: I70d37518b24034a1e133bf6e9248feb64d439e6a
Android Build Merger (Role) [Thu, 8 Jun 2017 05:55:28 +0000 (05:55 +0000)]
Merge "Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp am:
837f1167ca" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Thu, 8 Jun 2017 05:55:32 +0000 (05:55 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev am:
fdb3d31504
am:
13e4dfdceb
Change-Id: Id489b5ef70eb94b487d5cd913712594f8ca0b723
Android Build Merger (Role) [Thu, 8 Jun 2017 05:55:03 +0000 (05:55 +0000)]
Merge "Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am:
f34713066e am:
2bb4966dab" into oc-dr1-dev-plus-aosp
Todd Kennedy [Thu, 8 Jun 2017 05:54:33 +0000 (05:54 +0000)]
Merge changes Iea24e5a1,If71385bc into oc-dev
am:
3834421c96
Change-Id: I691d03a8396d26193622f171f70f82d7aa91cea2
Andreas Gampe [Thu, 8 Jun 2017 05:54:32 +0000 (05:54 +0000)]
Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp
am:
837f1167ca
Change-Id: I2a510538bace272330e1d4446adf2451f3bb4c07
Sudheer Shanka [Thu, 8 Jun 2017 05:53:00 +0000 (05:53 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am:
f34713066e
am:
2bb4966dab
Change-Id: Ib163b6a910f8206a6cc1767608fbbbac85bfd53f
Phil Weaver [Thu, 8 Jun 2017 05:52:11 +0000 (05:52 +0000)]
Merge "Confirm a11y shortcut service for correct user" into oc-dev
am:
03a5b3a509
Change-Id: I2e463c1602d1aca9d791d351f4170b0bac9abc90
Todd Kennedy [Thu, 8 Jun 2017 05:52:09 +0000 (05:52 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev am:
dacdf2e978
am:
ddb322a000
Change-Id: Ic3ba662f2821aa617be0fa271e92e6cb805097c8
Todd Kennedy [Thu, 8 Jun 2017 05:50:03 +0000 (05:50 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev
am:
dacdf2e978
Change-Id: Ie6e85346f63f4b06e693e6a6ac0c73b2ec3b9639
Android Build Merger (Role) [Thu, 8 Jun 2017 05:49:10 +0000 (05:49 +0000)]
Merge "Merge "Add timeout to StrictMode flash." into oc-dev am:
fdb3d31504 am:
b1a2cde4fd" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 8 Jun 2017 05:48:45 +0000 (05:48 +0000)]
Merge "Merge "resolve merge conflicts of
695f21a66189 to oc-dr1-dev" into oc-dr1-dev am:
be261948cb" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Thu, 8 Jun 2017 05:48:21 +0000 (05:48 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev am:
fdb3d31504
am:
b1a2cde4fd
Change-Id: I9164bc0eac776ff7e8a61c227e4ad9db45663542
Jeff Sharkey [Thu, 8 Jun 2017 05:47:38 +0000 (05:47 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev
am:
fdb3d31504
Change-Id: I646e27241743297d62a5442c845b61ee42b47a2f
Ian Pedowitz [Thu, 8 Jun 2017 05:46:25 +0000 (05:46 +0000)]
Merge "resolve merge conflicts of
695f21a66189 to oc-dr1-dev" into oc-dr1-dev
am:
be261948cb
Change-Id: I5f990815a7489828589303ee894ba3c94d6ef370
Sudheer Shanka [Thu, 8 Jun 2017 05:45:37 +0000 (05:45 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am:
f34713066e
am:
736cb0e33a
Change-Id: Ia4ae2f57539d652e9a898e4eb62d6b1bbc0de06a
Sudheer Shanka [Thu, 8 Jun 2017 05:44:49 +0000 (05:44 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
am:
f34713066e
Change-Id: Ic001bfa12fecb00b24d7170c841af21531bab28a
Ian Pedowitz [Thu, 8 Jun 2017 05:42:17 +0000 (05:42 +0000)]
Merge "resolve merge conflicts of
7ea4f66f3557 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
Ian Pedowitz [Thu, 8 Jun 2017 05:42:13 +0000 (05:42 +0000)]
Merge "resolve merge conflicts of
695f21a66189 to oc-dr1-dev" into oc-dr1-dev
Etan Cohen [Thu, 8 Jun 2017 05:32:09 +0000 (05:32 +0000)]
Merge "[AWARE] Add validity check on PMK/Passphrase lengths" into oc-dr1-dev
am:
89d6859dc4
Change-Id: Ib7dcbb63d9e41c8b9b3c702f883c84de06a23326
Etan Cohen [Thu, 8 Jun 2017 05:26:13 +0000 (05:26 +0000)]
Merge "[AWARE] Add validity check on PMK/Passphrase lengths" into oc-dr1-dev
Felipe Leme [Thu, 8 Jun 2017 05:25:17 +0000 (05:25 +0000)]
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
am:
9be8c96918
Change-Id: I5cb2eb64772ea9f3fc189f629be0ddcd29fbe4d9
Felipe Leme [Thu, 8 Jun 2017 05:21:02 +0000 (05:21 +0000)]
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
Kevin Chyn [Thu, 8 Jun 2017 04:53:31 +0000 (04:53 +0000)]
Add setting and permission for assist gesture
am:
4fddc9fa4d
Change-Id: Ife2ee905017b3a7489b4a338f6ebe59301301bd0
Mark Rathjen [Thu, 8 Jun 2017 04:50:16 +0000 (04:50 +0000)]
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
am:
3492ed4376
Change-Id: I424396abf3e403abd1eec8a529b0b322019b7a01
Mark Rathjen [Thu, 8 Jun 2017 04:43:56 +0000 (04:43 +0000)]
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
Kevin Chyn [Mon, 5 Jun 2017 18:28:09 +0000 (11:28 -0700)]
Add setting and permission for assist gesture
Bug:
37427306
Test: manual
Merged-In: I659fa43fb085575df4d62e7765d88c6fd615fb7d
Change-Id: I659fa43fb085575df4d62e7765d88c6fd615fb7d
Yuchen He [Thu, 8 Jun 2017 04:38:16 +0000 (04:38 +0000)]
Merge "Fix AeModeAndLock test cases. Bug:
36103813" into oc-dev
am:
3671e9249b
Change-Id: I2ebc01dc54f654d60e03696490c681a656a7b958
Yuchen He [Thu, 8 Jun 2017 04:32:31 +0000 (04:32 +0000)]
Merge "Fix AeModeAndLock test cases. Bug:
36103813" into oc-dev
Andreas Gampe [Thu, 8 Jun 2017 03:22:23 +0000 (03:22 +0000)]
Merge "Framework: Remove SamplingProfiler" am:
d2ecee2506
am:
3ea0309e39 -s ours
Change-Id: I41f6a58ee13d3b07298d41d9dfea330e91547b9b
Andreas Gampe [Thu, 8 Jun 2017 03:16:54 +0000 (03:16 +0000)]
Merge "Framework: Remove SamplingProfiler"
am:
d2ecee2506
Change-Id: Iccba75c67041593131bec64e518a1bd968cb1bb0
Treehugger Robot [Thu, 8 Jun 2017 03:05:57 +0000 (03:05 +0000)]
Merge "Framework: Remove SamplingProfiler"
Ian Pedowitz [Thu, 8 Jun 2017 01:07:43 +0000 (18:07 -0700)]
resolve merge conflicts of
7ea4f66f3557 to oc-dr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6f26542780c2b911e6aeea187c22e9d70823cd7a
Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7
Ian Pedowitz [Thu, 8 Jun 2017 00:47:38 +0000 (17:47 -0700)]
resolve merge conflicts of
695f21a66189 to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifeffa55c7fb80b0f327ecc5b50cefeca9db6457b
Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7
Adam Bookatz [Thu, 8 Jun 2017 02:48:32 +0000 (02:48 +0000)]
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
am:
6029bce3b4
Change-Id: I67da5b543fc839031d3d2544f3723b730edaa1a8
Adam Bookatz [Thu, 8 Jun 2017 02:43:14 +0000 (02:43 +0000)]
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
Todd Kennedy [Thu, 8 Jun 2017 01:49:03 +0000 (01:49 +0000)]
Merge changes Iea24e5a1,If71385bc into oc-dev
am:
3834421c96
Change-Id: I6ed4a41dbd9af3a97b774e7d2854fea1c66cc582
Phil Weaver [Thu, 8 Jun 2017 01:45:56 +0000 (01:45 +0000)]
Merge "Confirm a11y shortcut service for correct user" into oc-dev
am:
03a5b3a509
Change-Id: I99dbc13b0456e05f42d47b887e999931658f101d
TreeHugger Robot [Thu, 8 Jun 2017 01:40:03 +0000 (01:40 +0000)]
Merge changes Iea24e5a1,If71385bc into oc-dev
* changes:
expand who can uninstall an instant app
Final changes to protect the API surface
Phil Weaver [Thu, 8 Jun 2017 01:37:43 +0000 (01:37 +0000)]
Merge "Confirm a11y shortcut service for correct user" into oc-dev
Hall Liu [Thu, 8 Jun 2017 01:32:43 +0000 (01:32 +0000)]
Merge "Embms download setup" am:
da5b77fa9b
am:
a807ee8f1c
Change-Id: I6a78b3873814283d768c7e9a642b882bef8b11fc
Hall Liu [Thu, 8 Jun 2017 01:26:28 +0000 (01:26 +0000)]
Merge "Embms download setup"
am:
da5b77fa9b
Change-Id: I18b378fd0c999e40e3dc8cf9d1248414489880c6
Hall Liu [Thu, 8 Jun 2017 01:20:48 +0000 (01:20 +0000)]
Merge "Embms download setup"
TreeHugger Robot [Thu, 8 Jun 2017 01:08:20 +0000 (01:08 +0000)]
Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp
Todd Kennedy [Thu, 8 Jun 2017 01:05:25 +0000 (01:05 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev
am:
dacdf2e978
Change-Id: I11bcd48eb91c1f877a27f1cb06d6269aef76d3d2
Selim Cinek [Tue, 6 Jun 2017 00:50:19 +0000 (17:50 -0700)]
Fixed a bug where the navigation notification would flicker
Change-Id: Id68ba339407287d67d8db888515389e79e09ece3
Fixes:
62339936
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationCustomViewWrapperTest.java
TreeHugger Robot [Thu, 8 Jun 2017 01:00:47 +0000 (01:00 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev
Jeff Sharkey [Thu, 8 Jun 2017 00:36:09 +0000 (00:36 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev
am:
fdb3d31504
Change-Id: I13684a6c952e978eed035e8c217605469c3b8665
OSDN Git Service
