OSDN Git Service
Rohan Shah [Fri, 30 Mar 2018 23:43:44 +0000 (23:43 +0000)]
Merge "Revert "[Notif] Disable "Customize" for blocking helper"" into pi-dev
am:
13c78d15d8
Change-Id: I8f46afcb00e1bbee4e64803163e3a814ab2bf71b
Amin Shaikh [Fri, 30 Mar 2018 23:39:30 +0000 (23:39 +0000)]
Merge "Update QS edit layout." into pi-dev
am:
6a8ea4fe24
Change-Id: I1fb88d70ac7568085c774fb5d75a54218c4e271d
Howard Ro [Fri, 30 Mar 2018 23:35:17 +0000 (23:35 +0000)]
Merge "Remove bad configs by counting the number of statsd deaths" into pi-dev
am:
ea16812ad2
Change-Id: I623f417660ee57f106cf8aa87641873c1242b0dd
Yi Jin [Fri, 30 Mar 2018 23:30:40 +0000 (23:30 +0000)]
Merge "Use unique_fd with the clear ownership." into pi-dev
am:
1ebfc94aa1
Change-Id: I478af4173025470829785ef99e0444609c36ddf0
Chenjie Yu [Fri, 30 Mar 2018 23:09:17 +0000 (23:09 +0000)]
Merge "Clean up atoms.proto" into pi-dev
am:
9fef2594f3
Change-Id: If643c3ebd8800c1d55d20a21850e9b56e35acfab
Rahul Frias [Fri, 30 Mar 2018 23:02:15 +0000 (23:02 +0000)]
Merge "Clarified app behavior on REQUEST_TYPE_NONE" into pi-dev
am:
1b7162ad3d
Change-Id: I58f01676399514276b18d633bce4638dc179b66c
Benedict Wong [Fri, 30 Mar 2018 22:57:46 +0000 (22:57 +0000)]
[automerger skipped] Merge changes from topic "encap-api" into pi-dev
am:
36f2d8a4e1 -s ours
Change-Id: I19ea85409c7b8653a734e74afc092959e91a0aad
Android Build Merger (Role) [Fri, 30 Mar 2018 22:28:59 +0000 (22:28 +0000)]
Merge "[automerger skipped] Require explicitly supplied truncation length am:
bfa67c81bf -s ours" into pi-dev-plus-aosp
Benedict Wong [Fri, 30 Mar 2018 22:28:03 +0000 (22:28 +0000)]
[automerger skipped] Require explicitly supplied truncation length
am:
bfa67c81bf -s ours
Change-Id: I873ba85ee623a445c2ade21f656bd56e8a0fdeed
Android Build Merger (Role) [Fri, 30 Mar 2018 22:21:14 +0000 (22:21 +0000)]
Merge "Merge "Remove SignalClusterView in favor of IconManager" into pi-dev am:
eff51d566a" into pi-dev-plus-aosp
Evan Laird [Fri, 30 Mar 2018 22:20:44 +0000 (22:20 +0000)]
Merge "Remove SignalClusterView in favor of IconManager" into pi-dev
am:
eff51d566a
Change-Id: I38db8aab0ca303c854520a12eca062596dea1da3
Android Build Merger (Role) [Fri, 30 Mar 2018 22:17:39 +0000 (22:17 +0000)]
Merge "[automerger skipped] Merge "Fix socket leaks in various android.net.Network methods." am:
34ce11f2bd am:
f6ab9a5f96 -s ours" into pi-dev-plus-aosp
Paul Jensen [Fri, 30 Mar 2018 22:17:07 +0000 (22:17 +0000)]
[automerger skipped] Merge "Fix socket leaks in various android.net.Network methods." am:
34ce11f2bd
am:
f6ab9a5f96 -s ours
Change-Id: I6da127bed317ba1faf995ebb0236d91774782acb
Rohan Shah [Fri, 30 Mar 2018 22:16:05 +0000 (22:16 +0000)]
Merge "[Notif] Disable "Customize" for blocking helper" into pi-dev
am:
21ba6eff91
Change-Id: I21f6901af21779376c81ff35a5ec50c9ea270b3a
Vishwath Mohan [Fri, 30 Mar 2018 22:11:54 +0000 (22:11 +0000)]
Merge "Don't clear mPattern when clearing visual pattern." into pi-dev
am:
74d7f50597
Change-Id: I37e2d7e65048d4b4f0cf581bab04ea20baf7837b
Leon Scroggins III [Fri, 30 Mar 2018 22:07:10 +0000 (22:07 +0000)]
Remove chaining from ImageDecoder setters
am:
d9b53a097d
Change-Id: Ie8fa1121f804d3e20af03c910ac6001fe0c79bcf
Paul Jensen [Fri, 30 Mar 2018 22:03:22 +0000 (22:03 +0000)]
Merge "Fix socket leaks in various android.net.Network methods."
am:
34ce11f2bd
Change-Id: I1a59fced1f3bcd19bd48150ca215093dff431619
Brian C. Young [Fri, 30 Mar 2018 21:54:45 +0000 (21:54 +0000)]
Merge "Enable "Unlocked device required" API" into pi-dev
am:
1e0a9b0b1b
Change-Id: I5b7e01621d8c9432af06519993b8d65bbb5c6d7e
Jason Monk [Fri, 30 Mar 2018 21:48:11 +0000 (21:48 +0000)]
Merge "Add auto-grant permission slice API" into pi-dev
am:
4ced90cb12
Change-Id: I1cafb654553e62e8720d6c8b101328d5227dc545
Victor Hsieh [Fri, 30 Mar 2018 21:08:07 +0000 (21:08 +0000)]
Merge "Fix fs-verity per fs-verity spec change" into pi-dev
am:
01a0288ca1
Change-Id: I4d7aade7fe59008cd31073584fc0973f0ebc234a
Rohan Shah [Fri, 30 Mar 2018 21:05:07 +0000 (21:05 +0000)]
Merge "Revert "[Notif] Disable "Customize" for blocking helper"" into pi-dev
Rohan Shah [Fri, 30 Mar 2018 20:54:37 +0000 (20:54 +0000)]
Revert "[Notif] Disable "Customize" for blocking helper"
This reverts commit
3cfc950708fe22ded741da9e99ac0b86a0de763c.
Reason for revert:
Apparently a breakage got through treehugger - I hadn't synced my changes and one of the params was incorrect. Reverting for now and rebasing before resubmit...
Bug:
77321231
Change-Id: Ib306759d6344a69f17331a6c3c9cc78d1345508b
John Reck [Fri, 30 Mar 2018 21:00:57 +0000 (21:00 +0000)]
Merge "Fix MemoryFileTest coretest" into pi-dev
am:
ae202c6fda
Change-Id: I6988af543849b69fb859cfb2e2e384be03fb62b5
TreeHugger Robot [Fri, 30 Mar 2018 21:00:06 +0000 (21:00 +0000)]
Merge "Update QS edit layout." into pi-dev
Howard Ro [Fri, 30 Mar 2018 20:58:51 +0000 (20:58 +0000)]
Merge "Remove bad configs by counting the number of statsd deaths" into pi-dev
Yi Jin [Fri, 30 Mar 2018 20:53:30 +0000 (20:53 +0000)]
Merge "Use unique_fd with the clear ownership." into pi-dev
Treehugger Robot [Fri, 30 Mar 2018 20:52:42 +0000 (20:52 +0000)]
Merge "Fix socket leaks in various android.net.Network methods."
TreeHugger Robot [Fri, 30 Mar 2018 20:48:09 +0000 (20:48 +0000)]
Merge "Clean up atoms.proto" into pi-dev
Rahul Frias [Fri, 30 Mar 2018 20:33:24 +0000 (20:33 +0000)]
Merge "Clarified app behavior on REQUEST_TYPE_NONE" into pi-dev
Benedict Wong [Fri, 30 Mar 2018 20:28:19 +0000 (20:28 +0000)]
Merge changes from topic "encap-api" into pi-dev
* changes:
Require explicitly supplied truncation length
Clarify UDP encapsulation socket API
TreeHugger Robot [Fri, 30 Mar 2018 20:22:16 +0000 (20:22 +0000)]
Merge "Remove SignalClusterView in favor of IconManager" into pi-dev
Roshan Pius [Fri, 30 Mar 2018 20:15:57 +0000 (20:15 +0000)]
Merge "wifi metrics(proto): Add scan throttling metrics" into pi-dev
am:
09a42e9553
Change-Id: I7eb5d12578c6810bc96e02795313cbf5fc24f3e5
Pavlin Radoslavov [Fri, 30 Mar 2018 20:07:54 +0000 (20:07 +0000)]
Merge "Update Bluetooth codec related strings" into pi-dev
am:
68458a5148
Change-Id: I0d78d63c8ac749e96f648c20ae68677de3d6ec24
TreeHugger Robot [Fri, 30 Mar 2018 20:03:11 +0000 (20:03 +0000)]
Merge "[Notif] Disable "Customize" for blocking helper" into pi-dev
Tomasz Wasilczyk [Fri, 30 Mar 2018 20:02:56 +0000 (20:02 +0000)]
Merge "Workaround HAL 1.1 program list fetching limitation by preferring FM." into pi-dev
am:
86021cff1b
Change-Id: I8381abef3d03ba9ebb872d9d8ae23a2ea9533631
TreeHugger Robot [Fri, 30 Mar 2018 20:00:22 +0000 (20:00 +0000)]
Merge "Don't clear mPattern when clearing visual pattern." into pi-dev
Chris Tate [Fri, 30 Mar 2018 19:58:15 +0000 (19:58 +0000)]
Merge "Don't send idle-maint trigger broadcast as ordered" into pi-dev
am:
015f9609a4
Change-Id: I9e89d05bd6627bceeef5a10a1ae6145b7e9441ba
Rohan Shah [Fri, 30 Mar 2018 19:53:32 +0000 (19:53 +0000)]
Merge "[Notif] Dont show blocking helper for non-blockable notifs" into pi-dev
am:
160261a553
Change-Id: I46174e243469e37bad4a8a78060033cb69c2d232
Stan Iliev [Fri, 30 Mar 2018 19:48:19 +0000 (19:48 +0000)]
Merge "Fix memory leak in ShaderCache" into pi-dev
am:
e275d0bc19
Change-Id: I6428c1cfa94456814dedb5ede4ba51f3b1b1d706
Salvador Martinez [Fri, 30 Mar 2018 19:42:53 +0000 (19:42 +0000)]
Merge "Update triggering logic for hybrid notification" into pi-dev
am:
6abf6254d2
Change-Id: Ie631511fbafddb098bc17df779b72fd1c092b66c
Yu-Han Yang [Fri, 30 Mar 2018 19:36:55 +0000 (19:36 +0000)]
Merge "Move HIDL calls away from the main thread" into pi-dev
am:
322929af8d
Change-Id: Ida2ce61890408e823dec37f4b1490a03f428d2e7
Winson Chung [Fri, 30 Mar 2018 19:31:22 +0000 (19:31 +0000)]
Merge "Skip waiting for draw when triggering split screen from global action." into pi-dev
am:
cb903343f0
Change-Id: Ic5c26b8c734463259e5d199c403e7e1d3451ce0c
Jason Monk [Fri, 30 Mar 2018 19:26:53 +0000 (19:26 +0000)]
Merge "Add more AppComponentFactory docs" into pi-dev
am:
7790a2f2d1
Change-Id: I1db5961718407414d32d4d6bd263aa2c0872dc69
Paul Jensen [Thu, 29 Mar 2018 11:41:43 +0000 (07:41 -0400)]
Fix socket leaks in various android.net.Network methods.
Bug:
72124526
Test: make CtsNetTestCases
Merged-In: I2a2254ce65c2176ae0be1d6276034b1bb0cad987
Merged-In: I23150482d6c2ab2eaa2b37732af68af69320792b
Change-Id: I3398b67272360f894e01a8cdfbc47b17d77c2330
(cherry picked from commit
89bb993293f0d7a524d1404184a55584b59bb67c)
Amin Shaikh [Thu, 29 Mar 2018 21:27:26 +0000 (17:27 -0400)]
Update QS edit layout.
- Update TileLayout to lay out tiles rows in a similar fashion to
LinearLayout.
- Update edit screen layout to show rounded corners, margins, and
ensure that QS tiles line up with the tiles in QS.
- Show QS status bar header above the edit screen.
Change-Id: I6c8d644787bf1875ad0d7ad056e9909dc4919ce4
Fixes:
36076720
Test: visual
Leon Scroggins III [Tue, 27 Mar 2018 11:47:07 +0000 (07:47 -0400)]
Remove chaining from ImageDecoder setters
Bug:
76448408
Test: Infeasible
Change-Id: Ib0ef0a9a9b0f36481ed1bbb16ecaccd180df8915
TreeHugger Robot [Fri, 30 Mar 2018 18:54:39 +0000 (18:54 +0000)]
Merge "Enable "Unlocked device required" API" into pi-dev
Evan Laird [Tue, 20 Mar 2018 20:58:01 +0000 (16:58 -0400)]
Remove SignalClusterView in favor of IconManager
Refactors SignalClusterView into StatusBarSignalPolicy so that it can be
used in a StatusBarIconContainer and solve all of our status bar
problems.
- Remove all uses of SignalClusterView and references to
R.id.signal_cluster. The class still exists it's just unused now
- Add StatusBarIconHolder, which can point to StatusBarIcon,
WifiIconState, or PhoneIconState
- StatusBarIconList.Slot. Allows for easier indexing of icons now that
there can be multiple icons per slot
- Add StatusBarWifiView to be inflated inside of the
StatusBarIconController when needed
- StatusBarMobile view. similar to above
- Upgrade StatusBarIconControllerImpl and StatusBarIconList to
understand the holders and added 2 new methods to specifically handle
wifi / phone state changes
- Create IStatusBarIconView (todo: rename). Abstracts the properties we
want away from StatusBarIconView so that we can use an arbitrary view
type
- NeutralGoodDrawable. Draws a light and a dark icon when needed.
- Fixes a few demo mode bugs: multi sim was broken and also turning off
demo mode was a little broken
TODO: More tests are needed for StatusBarSignalPolicy and maybe the
IconManagers
Test: runtest systemui; visual
Bug:
63772836
Bug:
73778753
Bug:
74985733
Fixes:
74427768
Fixes:
74338687
Fixes:
74388467
Change-Id: I5621b3013cdc9638b61552bd4d7211f211eddf1b
jiabin [Fri, 30 Mar 2018 18:48:24 +0000 (18:48 +0000)]
Merge "Make back mic available when getting all available mic." into pi-dev
am:
cfe67aa575
Change-Id: I615ca1b647ba3548648fff40198aa0bcd4ea1a04
TreeHugger Robot [Fri, 30 Mar 2018 18:45:00 +0000 (18:45 +0000)]
Merge "Add auto-grant permission slice API" into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 18:43:24 +0000 (18:43 +0000)]
Merge "Fix fs-verity per fs-verity spec change" into pi-dev
Dmitry Dementyev [Fri, 30 Mar 2018 18:40:47 +0000 (18:40 +0000)]
Merge "Remove deprecated generateAndStoreKey method implementation" into pi-dev
am:
912853be10
Change-Id: I977be0a087f6fa2d98e519c384e2694d2117bef3
Julia Reynolds [Fri, 30 Mar 2018 18:35:33 +0000 (18:35 +0000)]
Merge "Catch unbinding errors" into pi-dev
am:
47335f6e1c
Change-Id: Ibb4aed1aea64d3f3b1a88829cbdf3cc28a1799d5
Pavel Maltsev [Fri, 30 Mar 2018 18:30:23 +0000 (18:30 +0000)]
Merge "Add OEM_PAID capability to system api" into pi-dev
am:
8982a81f3c
Change-Id: Ic164c4a29cd449a31b2f1c12c8c345bcc5dc77fa
Jeff Sharkey [Fri, 30 Mar 2018 18:22:13 +0000 (18:22 +0000)]
Merge "API council requested tweaks to NetworkRequest." into pi-dev
am:
e6b1a7804d
Change-Id: I0d090ebb7d57689a061badcf593ae9a37d88f7ce
Julia Reynolds [Fri, 30 Mar 2018 18:16:25 +0000 (18:16 +0000)]
Merge "Show media stream always when a11y is active stream" into pi-dev
am:
9ba5dfc750
Change-Id: Ib60cb268a33cf1f4658647514fe606df914ed945
Rohan Shah [Fri, 30 Mar 2018 18:11:23 +0000 (18:11 +0000)]
Merge "[QS] Override/add long click accessibility action" into pi-dev
am:
2d2f598d69
Change-Id: Ia11527f6bc12477744dc597b3521323b5fcd2c86
Beverly [Fri, 30 Mar 2018 18:06:14 +0000 (18:06 +0000)]
Merge "System notif channels updated on locale change" into pi-dev
am:
e3ba496485
Change-Id: Ic104cb322ab217251eb715fd4e7c9f8a48fda1e5
TreeHugger Robot [Fri, 30 Mar 2018 18:01:21 +0000 (18:01 +0000)]
Merge "Fix MemoryFileTest coretest" into pi-dev
Jason Monk [Fri, 30 Mar 2018 18:01:03 +0000 (18:01 +0000)]
Merge "Slices: Fix up some formatting and add examples" into pi-dev
am:
ea3377b4d4
Change-Id: Ia042aef5f36acf97b491faf07a5dc010927a6253
Vishwath Mohan [Thu, 29 Mar 2018 17:56:33 +0000 (17:56 +0000)]
Don't clear mPattern when clearing visual pattern.
This CL ensures that when clearing the lockscreen pattern in
onHandleUp(), we retain mPattern. This fixes a bug that prevents
changing from Pattern to other modalities.
Bug:
77257848
Test: Change from pattern to pin/password
Change-Id: Ied74eafd17939214c62bdd617ecef7a9974f755d
TreeHugger Robot [Fri, 30 Mar 2018 17:58:36 +0000 (17:58 +0000)]
Merge "wifi metrics(proto): Add scan throttling metrics" into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 17:51:04 +0000 (17:51 +0000)]
Merge "Update Bluetooth codec related strings" into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 17:50:11 +0000 (17:50 +0000)]
Merge "Workaround HAL 1.1 program list fetching limitation by preferring FM." into pi-dev
Rohan Shah [Fri, 30 Mar 2018 17:14:22 +0000 (10:14 -0700)]
[Notif] Disable "Customize" for blocking helper
Update UI to hide customize when blocking helper is showing. Fixed a
small problem with context.getString too where it was unnecessarily
passing in a format string argument.
Test: Visually
Test: Ran atest NotifInfoTest with new test case
Fixes:
77321231
Change-Id: Ia03ea7badc7aa7ccd7b3a0e235cce2363ace9953
Chris Tate [Fri, 30 Mar 2018 17:47:15 +0000 (17:47 +0000)]
Merge "Don't send idle-maint trigger broadcast as ordered" into pi-dev
Yi Jin [Fri, 30 Mar 2018 17:45:47 +0000 (17:45 +0000)]
Merge "Enable Last Kmsg, also fix the GZipSection test." into pi-dev
am:
75c4f589b9
Change-Id: I49efe452e65055a64f44564e0c04b958d82bb332
TreeHugger Robot [Fri, 30 Mar 2018 17:43:33 +0000 (17:43 +0000)]
Merge "[Notif] Dont show blocking helper for non-blockable notifs" into pi-dev
Brad Stenning [Fri, 30 Mar 2018 17:37:24 +0000 (17:37 +0000)]
Merge "Allow for the different nav bars before the device is provisioned Split window creation from content creation so I could remove and add new content once the provisioned state changed." into pi-dev
am:
1fe1ef0d6e
Change-Id: I4595133eef28d81622f35bdcb4fd0a814acb4a41
TreeHugger Robot [Fri, 30 Mar 2018 17:33:13 +0000 (17:33 +0000)]
Merge "Fix memory leak in ShaderCache" into pi-dev
Makoto Onuki [Fri, 30 Mar 2018 17:32:15 +0000 (17:32 +0000)]
Merge "Make battery saver suggestion configurable" into pi-dev
am:
cd21f1c5c2
Change-Id: I4fb41a9382d2a073f7673cdaa5c4a3d670ff4349
Salvador Martinez [Fri, 30 Mar 2018 17:25:00 +0000 (17:25 +0000)]
Merge "Update triggering logic for hybrid notification" into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 17:20:26 +0000 (17:20 +0000)]
Merge "Move HIDL calls away from the main thread" into pi-dev
Winson Chung [Fri, 30 Mar 2018 17:16:59 +0000 (17:16 +0000)]
Merge "Skip waiting for draw when triggering split screen from global action." into pi-dev
Chenjie Yu [Tue, 6 Mar 2018 23:48:54 +0000 (15:48 -0800)]
Clean up atoms.proto
changes are:
1) for pushed atoms, use attribution node in place of uid when
appropriate
2) name changes to be more consistent
Bug:
73823969
Test: manual test
Change-Id: Iacf7186dbd7a2282f7fe481f43dbbf92e1165b47
TreeHugger Robot [Fri, 30 Mar 2018 17:08:23 +0000 (17:08 +0000)]
Merge "Add more AppComponentFactory docs" into pi-dev
Brian Young [Fri, 30 Mar 2018 17:05:16 +0000 (17:05 +0000)]
Merge changes from topics "niap-asym-write-pi-dev", "niap-asym-write-api-pi-dev" into pi-dev
am:
0186b42f2a
Change-Id: I18cba5e8695246b45972186e2c79d5d36a61c316
TreeHugger Robot [Fri, 30 Mar 2018 16:59:41 +0000 (16:59 +0000)]
Merge "Make back mic available when getting all available mic." into pi-dev
Brian Young [Fri, 30 Mar 2018 16:57:43 +0000 (16:57 +0000)]
Add "Unlocked device required" key API
am:
36716eb470
Change-Id: I5ae5878faa4681dbbf84b16a24c79a5315a97ccb
Dmitry Dementyev [Fri, 30 Mar 2018 16:44:53 +0000 (16:44 +0000)]
Merge "Remove deprecated generateAndStoreKey method implementation" into pi-dev
Rubin Xu [Fri, 30 Mar 2018 16:41:15 +0000 (16:41 +0000)]
Merge "Remove password blacklist API" into pi-dev
am:
69196f6fad
Change-Id: I7e7c2cc2198d001ca068e6ce41befb1bc285b55f
Julia Reynolds [Fri, 30 Mar 2018 16:33:40 +0000 (16:33 +0000)]
Merge "Catch unbinding errors" into pi-dev
Beverly [Fri, 30 Mar 2018 16:33:19 +0000 (16:33 +0000)]
Merge "Don't exit dnd rule for old alarms" into pi-dev
am:
df3788dcd8
Change-Id: Id98f6a123ff7299f7706759e734978c60ac1229a
Pavel Maltsev [Fri, 30 Mar 2018 16:32:52 +0000 (16:32 +0000)]
Merge "Add OEM_PAID capability to system api" into pi-dev
Jeff Sharkey [Fri, 30 Mar 2018 16:30:24 +0000 (16:30 +0000)]
Merge "API council requested tweaks to NetworkRequest." into pi-dev
Julia Reynolds [Fri, 30 Mar 2018 16:28:04 +0000 (16:28 +0000)]
Merge "Show media stream always when a11y is active stream" into pi-dev
Robert Berry [Fri, 30 Mar 2018 16:27:47 +0000 (16:27 +0000)]
Merge "Update RecoveryController JavaDoc" into pi-dev
am:
d490937854
Change-Id: Idddc67da9872b9c99a0074e2382b8c79ecf57a86
Paul Jensen [Fri, 30 Mar 2018 16:22:51 +0000 (16:22 +0000)]
Merge "Fix socket leaks in various android.net.Network methods." into pi-dev
am:
9c1597bff7
Change-Id: I2a2254ce65c2176ae0be1d6276034b1bb0cad987
Remi NGUYEN VAN [Fri, 30 Mar 2018 16:17:17 +0000 (16:17 +0000)]
[automerger skipped] Merge "Use InterfaceSet for upstream interfaces." into pi-dev
am:
671547b224 -s ours
Change-Id: Idf53f65864df4d18028973d56edb2311f3295919
Remi NGUYEN VAN [Fri, 30 Mar 2018 16:13:29 +0000 (16:13 +0000)]
[automerger skipped] Merge "Add tests for IPv4 of dual stack tethering." into pi-dev
am:
4140cc106e -s ours
Change-Id: Ie778c0dc85dc9c49a3b9f6469de26958bfe99aac
Chalard Jean [Fri, 30 Mar 2018 16:10:31 +0000 (16:10 +0000)]
Merge "Limit the number of routes for performance" into pi-dev
am:
37e8dfa8e9
Change-Id: Ida402ad8f864400561bba0e07cfd5fe766ee08bd
Chalard Jean [Fri, 30 Mar 2018 16:05:29 +0000 (16:05 +0000)]
Merge "Clarify documentation for getActiveNetworkInfo and friends" into pi-dev
am:
1a8d1a51cf
Change-Id: Iab75c8d432ca68031bcf7cbf22baf8269169a908
Bernie Innocenti [Fri, 30 Mar 2018 16:00:31 +0000 (16:00 +0000)]
Merge "Relax APF version check in ApfGenerator" into pi-dev
am:
16caf6b62e
Change-Id: I61e37df73de4bf12f41389a7e7f999c44918d11e
Remi NGUYEN VAN [Fri, 30 Mar 2018 15:55:32 +0000 (15:55 +0000)]
[automerger skipped] Merge "Allow null subscriberId in NetworkStatsManager." into pi-dev
am:
bd2c0fa813 -s ours
Change-Id: I6e8983cc087a8a42e1404bb5f99bcd297b0ff313
Chenjie Yu [Fri, 30 Mar 2018 15:51:36 +0000 (15:51 +0000)]
Merge "Add unit test ValueMetricProducer on boundary" into pi-dev
am:
e647afe321
Change-Id: I768625dec77352801267332e579271d4910a9150
David Brazdil [Fri, 30 Mar 2018 15:46:36 +0000 (15:46 +0000)]
Merge "Add more hidden API on light greylist" into pi-dev
am:
b5dcf7d3ac
Change-Id: Ia315d1e1b9adc0a94eb5a499fe3d4594f936cb1c
Rohan Shah [Fri, 30 Mar 2018 15:45:53 +0000 (15:45 +0000)]
Merge "[QS] Override/add long click accessibility action" into pi-dev
Roshan Pius [Tue, 27 Mar 2018 21:33:01 +0000 (14:33 -0700)]
wifi metrics(proto): Add scan throttling metrics
Bug:
76429171
Test: Unit tests
Change-Id: I77cd03d323e1edbb93369945532c8d2f24bffd68
Peiyong Lin [Fri, 30 Mar 2018 15:40:13 +0000 (15:40 +0000)]
Merge "Rename GraphicsTypes.h to GraphicTypes.h" into pi-dev
am:
3d8fa52f59
Change-Id: Ibfb1682f7d21dfd0b8cd1d63007f89f7a34f06b8
Jason Monk [Fri, 30 Mar 2018 15:26:56 +0000 (11:26 -0400)]
Add auto-grant permission slice API
Test: slice manager tests
Bug:
77313888
Change-Id: I21e9200c5c8cd7ff812d3f5eac997a704a9b86a2
OSDN Git Service
