OSDN Git Service
Aurimas Liutikas [Wed, 8 Feb 2017 18:48:40 +0000 (10:48 -0800)]
Move FragmentState out of Fragments.java [framework edition]
Fragments.java contained 2 top level classes FragmentState and Fragments.
This CL moves FragmentState into its own java file. On the plus side we
will have one top level class per file as mandated by Google style, on the
downside per line history will be a bit harder to do for FragmentState class,
however it does not seem to have a lot of logic so it should be an OK loss.
Test: None
Change-Id: I85a1e5e91c87c1b123026fa79efb96f1d65b4b82
Abodunrinwa Toki [Thu, 20 Apr 2017 16:39:54 +0000 (16:39 +0000)]
Merge "Merge "TRON: Log "textAssist" actions." into oc-dev am:
fa9d889d3e" into oc-dev-plus-aosp
am:
a039aa4439
Change-Id: I417110a15dfef29ff01fcd923ae29ec6f76f4d51
Gustav Sennton [Thu, 20 Apr 2017 16:36:40 +0000 (16:36 +0000)]
Merge "Merge "Add shell command for turning on/off WebView multiprocess." into oc-dev am:
96d27d826f" into oc-dev-plus-aosp
am:
ef5040f450
Change-Id: If404f1017e665ebee370a98b88e748eba755c0d3
Erik Kline [Thu, 20 Apr 2017 16:34:40 +0000 (16:34 +0000)]
Merge "Merge "Switch to WifiManager.{start,stop}SoftAp()" am:
275edcb940 am:
11fdd1769b am:
7d321645a2" into oc-dev-plus-aosp
am:
2ed3ff115b
Change-Id: I1977863e251678fcd8131b90c8f8557af051b5b3
Clara Bayarri [Thu, 20 Apr 2017 16:31:49 +0000 (16:31 +0000)]
Merge "Api Council: hide FontsContract.Columns constructor" into oc-dev am:
1ef45a8bed
am:
18d539cd0a
Change-Id: I1712bdf8f1cb559a657407785230eccb4dd75722
Erik Kline [Thu, 20 Apr 2017 16:29:52 +0000 (16:29 +0000)]
Merge "Add local-only hotspot info into tether state change broadcast" am:
4c7a999d79 am:
6af3dd0fc3 am:
3fa8908370
am:
c9ee35581c
Change-Id: I7fa567b7af041bf2557cdc1d97a73440758ceb0c
Hugo Benichi [Thu, 20 Apr 2017 16:28:06 +0000 (16:28 +0000)]
Merge "ConnectivityManager: remove obsolete callback types" am:
458f75ef69 am:
23ee1621c7 am:
b51307e12e
am:
7b8fc6ea79
Change-Id: Ic919f56d9aca75842129f96d0b5b75b53c1e9fd8
Erik Kline [Thu, 20 Apr 2017 16:22:44 +0000 (16:22 +0000)]
Merge "Make tetherChangePermission to be secured for AppOps permission" am:
fe86a197a1 am:
0d1f04384f am:
d9bfb83d96
am:
372edc3b7d
Change-Id: I7f09742f4c8e78d41a0bce29fe5d356472819869
Hugo Benichi [Thu, 20 Apr 2017 16:14:29 +0000 (16:14 +0000)]
resolve merge conflicts of
7bbd03be361f to oc-dev-plus-aosp
am:
3ff96e5dd8
Change-Id: Icc32ac9d8b5301e43579194736cceb24637de0c8
Adrian Roos [Thu, 20 Apr 2017 16:12:50 +0000 (16:12 +0000)]
Merge "AOD: Fix broken triggers after failed prox check" into oc-dev am:
017f5df1e7
am:
06c68a68ef
Change-Id: Ifbcaaf8d580e5c55016040e9bdc5afd27ebcefd6
Adrian Roos [Thu, 20 Apr 2017 16:10:57 +0000 (16:10 +0000)]
Merge "A11y: Better label status bar icons" into oc-dev am:
5403f387d4
am:
9f635a82fc
Change-Id: I48ec2e5db7dbb54125d72990d115fb5d04ff303f
Jocelyn Dang [Thu, 20 Apr 2017 16:08:48 +0000 (16:08 +0000)]
Merge "Add min and max learned battery capacity to batterystats." into oc-dev am:
b2aa0ceb0d
am:
f29eb24c4e
Change-Id: I8f86cadf46b4cb9dc3dc87c1137f3b876108fca3
Android Build Merger (Role) [Thu, 20 Apr 2017 16:06:34 +0000 (16:06 +0000)]
Merge "Merge "TRON: Log "textAssist" actions." into oc-dev am:
fa9d889d3e" into oc-dev-plus-aosp
Hugo Benichi [Thu, 20 Apr 2017 16:06:27 +0000 (16:06 +0000)]
Merge changes Ic029cc9f,Id917f3a2 into oc-dev am:
addfe673d8 -s ours
am:
770e26ad6e -s ours
Change-Id: I724372ba07b4f6008e0e9240d65842b3712f56d3
Abodunrinwa Toki [Thu, 20 Apr 2017 16:05:43 +0000 (16:05 +0000)]
Merge "TRON: Log "textAssist" actions." into oc-dev
am:
fa9d889d3e
Change-Id: I068828dfb979dec12f30b7b0d01464d0bb895691
Android Build Merger (Role) [Thu, 20 Apr 2017 16:05:00 +0000 (16:05 +0000)]
Merge "Merge "Add shell command for turning on/off WebView multiprocess." into oc-dev am:
96d27d826f" into oc-dev-plus-aosp
Gustav Sennton [Thu, 20 Apr 2017 16:03:16 +0000 (16:03 +0000)]
Merge "Add shell command for turning on/off WebView multiprocess." into oc-dev
am:
96d27d826f
Change-Id: Ibd0cef2732f1c61a63d8dfd5c23454e123667cb2
Android Build Merger (Role) [Thu, 20 Apr 2017 16:03:00 +0000 (16:03 +0000)]
Merge "Merge "Switch to WifiManager.{start,stop}SoftAp()" am:
275edcb940 am:
11fdd1769b am:
7d321645a2" into oc-dev-plus-aosp
Erik Kline [Thu, 20 Apr 2017 16:02:06 +0000 (16:02 +0000)]
Merge "Switch to WifiManager.{start,stop}SoftAp()" am:
275edcb940 am:
11fdd1769b
am:
7d321645a2
Change-Id: I40e72d9b8f99c52089a8c73c8ca20d1efd10c68d
Clara Bayarri [Thu, 20 Apr 2017 16:01:03 +0000 (16:01 +0000)]
Merge "Api Council: hide FontsContract.Columns constructor" into oc-dev
am:
1ef45a8bed
Change-Id: Ife03fa12b508a54465a3b57f9b97ed1bb0a6c059
Erik Kline [Thu, 20 Apr 2017 15:54:32 +0000 (15:54 +0000)]
Merge "Switch to WifiManager.{start,stop}SoftAp()" am:
275edcb940
am:
11fdd1769b
Change-Id: If43782074b323a7e2da4315ca342a3706d510959
Erik Kline [Thu, 20 Apr 2017 15:50:19 +0000 (15:50 +0000)]
Merge "Switch to WifiManager.{start,stop}SoftAp()"
am:
275edcb940
Change-Id: I697bf530da9786da4ed1405ac8b44b7bc4d097a6
Treehugger Robot [Thu, 20 Apr 2017 15:37:29 +0000 (15:37 +0000)]
Merge "Switch to WifiManager.{start,stop}SoftAp()"
Svetoslav Ganov [Thu, 20 Apr 2017 15:28:57 +0000 (15:28 +0000)]
Merge "Address API council comments" into oc-dev am:
fb4fb03cc3
am:
375d615b30
Change-Id: Ibba72870f4d4da53ab411b5e279a967a86584e19
Wyatt Riley [Thu, 20 Apr 2017 15:19:07 +0000 (15:19 +0000)]
Merge "Loading gps_debug configuration before use" into oc-dev am:
08ca0a5a9e
am:
232b901493
Change-Id: I0be911b16e034f9e603ebf65c72b964444c1c054
Ashutosh Joshi [Thu, 20 Apr 2017 15:16:43 +0000 (15:16 +0000)]
Merge "Ensure that LLOB sensor is names similr to other android sensors." into oc-dev am:
bf2e5bd0f9
am:
ae1fb69407
Change-Id: Ibe4c0ed4c5cdc53a804a4e7ed8098f800e5bfb46
Jaewan Kim [Thu, 20 Apr 2017 15:14:26 +0000 (15:14 +0000)]
Merge "MediaSessionService: Clear calling identity for incoming calls from apps" into oc-dev am:
2891f34ea9
am:
84589843d1
Change-Id: I19179969664e6e9f9c147a5886b512617f0f5afa
Winson Chung [Thu, 20 Apr 2017 15:12:04 +0000 (15:12 +0000)]
Merge "Fixing issue with positioning tasks when moving to fullscreen." into oc-dev am:
949b512761
am:
66864b862c
Change-Id: I2206d28c53073f22f77727518273f4e38466648b
Christopher Tate [Thu, 20 Apr 2017 15:09:39 +0000 (15:09 +0000)]
Merge "Revert "Introduce PACKAGE_FIRST_ADDED broadcast"" into oc-dev am:
aa6b649a35
am:
e56d699a89
Change-Id: I5d684f3dc14130655868394b001d2960a84d1579
Peng Xu [Thu, 20 Apr 2017 15:07:58 +0000 (15:07 +0000)]
Merge "Intern Sensor object string using java String.intern()" into oc-dev am:
37658383b4
am:
9399a9d6d5
Change-Id: I4515454957b30656d4958e057272db9c8d035784
Robert Carr [Thu, 20 Apr 2017 15:06:12 +0000 (15:06 +0000)]
Merge "Delay PiP transition to fullscreen until activities draw." into oc-dev am:
aca246565a
am:
18450fafa1
Change-Id: I02cc256afe8e238a02789c499e16fdfa660cc59c
Martijn Coenen [Thu, 20 Apr 2017 15:03:20 +0000 (15:03 +0000)]
Merge "Validate incoming data properly." into oc-dev am:
a0aa7c3093
am:
621c6019e7
Change-Id: I85b3b6a099cf1a7a7f1134f23601b8d2a774f6a3
Garfield Tan [Thu, 20 Apr 2017 15:01:26 +0000 (15:01 +0000)]
Merge "Add a null check for visibleFile." into oc-dev am:
1fb3e56998
am:
8a9a686c9f
Change-Id: I7ed34f0644cd219e5a1f295c91f3b81605526b15
Ian Lake [Thu, 20 Apr 2017 14:59:35 +0000 (14:59 +0000)]
Merge "Move expensive TextClock operations to onAttach" into oc-dev am:
4f3ba1aeed
am:
2e342f875d
Change-Id: I041f493629d356fcdaf204a3c49aea969a259572
Selim Cinek [Thu, 20 Apr 2017 14:57:42 +0000 (14:57 +0000)]
Merge changes Ic76d996f,Ib9eefacb,If1b63340,I399c66af into oc-dev am:
947be6bed9
am:
c40344bf86
Change-Id: I849b78ceb45e22ab1b63bf4fbb88aac40625fd22
Dianne Hackborn [Thu, 20 Apr 2017 14:44:48 +0000 (14:44 +0000)]
Merge "Fix issue #
37470038: API Review: ServiceConnection.onBindingDead()" into oc-dev am:
232ff0bdc8
am:
54246d5374
Change-Id: Id414ddd56d711cf4f0e383d8e0964add4129eec0
William Luh [Thu, 20 Apr 2017 14:41:21 +0000 (14:41 +0000)]
Merge "Prevent settings from crashing when ContentProvider crashes" into oc-dev am:
a875bf3ebe
am:
56cb6eb587
Change-Id: I968fa939194cc72ebabf1941514fa853eec85e39
Christopher Tate [Thu, 20 Apr 2017 14:39:30 +0000 (14:39 +0000)]
Merge "Treat the intent filter verifier app as foreground" into oc-dev am:
4b26576175
am:
1777b3f5a6
Change-Id: I8fc06443c25f0360cd140e5b3b01c27f66b32416
Suprabh Shukla [Thu, 20 Apr 2017 14:37:05 +0000 (14:37 +0000)]
Merge "Package installer related changes to javadoc" into oc-dev am:
52312298b6
am:
a2450bacdc
Change-Id: I7bf7b87bfc5f4eb71b8cc1177375c257e5c79499
Todd Kennedy [Thu, 20 Apr 2017 14:29:27 +0000 (14:29 +0000)]
Merge "Adjust the bind timeout" into oc-dev am:
9d9d31d6b0
am:
a01fbf8ebb
Change-Id: Ib1224838aa09c434e1113891e9b4e1fdaa19a0d7
Todd Kennedy [Thu, 20 Apr 2017 14:27:50 +0000 (14:27 +0000)]
Merge "don't blindly reuse content providers" into oc-dev am:
9b32a057c7
am:
21967abbf7
Change-Id: I990d53630facae05a697b1fbffec6f03534b89af
Android Build Merger (Role) [Thu, 20 Apr 2017 14:17:20 +0000 (14:17 +0000)]
Merge "Merge "Opt out default focus highlight for TV." into oc-dev am:
6a08dfab0e am:
31d5f7ee7c"
Jiaquan He [Thu, 20 Apr 2017 14:14:30 +0000 (14:14 +0000)]
Merge "Opt out default focus highlight for TV." into oc-dev am:
6a08dfab0e
am:
31d5f7ee7c
Change-Id: Ia5bef6864d45774262f00dfb10ba9c10d274e470
Android Build Merger (Role) [Thu, 20 Apr 2017 14:14:07 +0000 (14:14 +0000)]
Merge "Merge "Fix tint on accessibility stream" into oc-dev am:
269e549e44 am:
8236e2c889"
Jason Monk [Thu, 20 Apr 2017 14:11:27 +0000 (14:11 +0000)]
Merge "Fix tint on accessibility stream" into oc-dev am:
269e549e44
am:
8236e2c889
Change-Id: I024abdf786dc1347718b25f0fdb4620672b1067b
Android Build Merger (Role) [Thu, 20 Apr 2017 14:10:22 +0000 (14:10 +0000)]
Merge "Merge "Fix issue #
37306208: CTS: ServiceTest#testForegroundService..." into oc-dev am:
8305a1fb38 am:
c98b052084"
Dianne Hackborn [Thu, 20 Apr 2017 14:03:35 +0000 (14:03 +0000)]
Merge "Fix issue #
37306208: CTS: ServiceTest#testForegroundService..." into oc-dev am:
8305a1fb38
am:
c98b052084
Change-Id: If92fbe83687cbc2a316b82ba23bb6eb02d315b2a
Android Build Merger (Role) [Thu, 20 Apr 2017 14:03:12 +0000 (14:03 +0000)]
Merge "Merge "Allow verifier to be optional" into oc-dev am:
8ffd8f7848 am:
72287ab766"
Erik Kline [Thu, 20 Apr 2017 14:02:24 +0000 (14:02 +0000)]
Merge "Add local-only hotspot info into tether state change broadcast" am:
4c7a999d79 am:
6af3dd0fc3
am:
3fa8908370
Change-Id: If3851c3f15314e3c0d357e154049aaa2b8b5c8e7
Todd Kennedy [Thu, 20 Apr 2017 14:00:26 +0000 (14:00 +0000)]
Merge "Allow verifier to be optional" into oc-dev am:
8ffd8f7848
am:
72287ab766
Change-Id: I8fa8fa36781444904eb13bea539d283f79462186
Android Build Merger (Role) [Thu, 20 Apr 2017 13:59:50 +0000 (13:59 +0000)]
Merge "Merge "Merge "Expose LE advertiser address for easier PTS tests (1/6)" am:
f2e6988350 am:
fc99848b96 am:
f3732e2fe2" into oc-dev-plus-aosp am:
88522c5f5d"
Hugo Benichi [Thu, 20 Apr 2017 13:59:32 +0000 (13:59 +0000)]
Merge "ConnectivityManager: remove obsolete callback types" am:
458f75ef69 am:
23ee1621c7
am:
b51307e12e
Change-Id: I2f5fad0b559b972e82ecacdfcdd3805f0fbb2655
Jakub Pawlowski [Thu, 20 Apr 2017 13:56:06 +0000 (13:56 +0000)]
Merge "Merge "Expose LE advertiser address for easier PTS tests (1/6)" am:
f2e6988350 am:
fc99848b96 am:
f3732e2fe2" into oc-dev-plus-aosp
am:
88522c5f5d
Change-Id: I8a07a4e8a6466d5629d504e900c11d5164ba9490
Android Build Merger (Role) [Thu, 20 Apr 2017 13:55:31 +0000 (13:55 +0000)]
Merge "Merge "Change mask path to only use cubicTo notation so that isConvex is always true. Bug:
37100106" into oc-dev am:
f9f8120e56 am:
34a50ae5f9"
Hyunyoung Song [Thu, 20 Apr 2017 13:52:48 +0000 (13:52 +0000)]
Merge "Change mask path to only use cubicTo notation so that isConvex is always true. Bug:
37100106" into oc-dev am:
f9f8120e56
am:
34a50ae5f9
Change-Id: Ib219189920f2604c0a463860eb21b82a5e6507a5
Erik Kline [Thu, 20 Apr 2017 13:52:35 +0000 (13:52 +0000)]
Merge "Make tetherChangePermission to be secured for AppOps permission" am:
fe86a197a1 am:
0d1f04384f
am:
d9bfb83d96
Change-Id: I6dd418684b1a40292cd496ead3613cf938577c09
Android Build Merger (Role) [Thu, 20 Apr 2017 13:52:19 +0000 (13:52 +0000)]
Merge "Merge "Log when an app targeting O does not specify a channel" into oc-dev am:
af12b17674 am:
e5dbc384fd"
Geoffrey Pitsch [Thu, 20 Apr 2017 13:49:36 +0000 (13:49 +0000)]
Merge "Log when an app targeting O does not specify a channel" into oc-dev am:
af12b17674
am:
e5dbc384fd
Change-Id: I89607e6075c64d4b25c2794b74cc60b4d35e7344
Android Build Merger (Role) [Thu, 20 Apr 2017 13:49:05 +0000 (13:49 +0000)]
Merge "Merge "Set the color space as nullptr on native bitmaps when sRGB is requested" into oc-dev am:
e53b00c6d1 am:
09071f9bdf"
Romain Guy [Thu, 20 Apr 2017 13:46:24 +0000 (13:46 +0000)]
Merge "Set the color space as nullptr on native bitmaps when sRGB is requested" into oc-dev am:
e53b00c6d1
am:
09071f9bdf
Change-Id: I7229520e46f2ee3f0f49f0971b761b2a4a4358c1
Android Build Merger (Role) [Thu, 20 Apr 2017 13:44:12 +0000 (13:44 +0000)]
Merge changes from topic 'am-
3df7247558f2482ba6861f739fe61c7e'
* changes:
Merge changes from topic 'chooser' into oc-dev am:
28602c0921 am:
4d0f44d7a7
Create a valid ActivityOptions Bundle even for default animations am:
b759bd3b4a am:
d85e60aa46
Remove scale up animation for startActivity from RemoteViews am:
95b193fdca am:
594f401e26
Ian Lake [Thu, 20 Apr 2017 13:40:10 +0000 (13:40 +0000)]
Merge changes from topic 'chooser' into oc-dev am:
28602c0921
am:
4d0f44d7a7
Change-Id: Ic8ce0c2e7d397fbd0f3d2aa38f0eff9bbf7f4e8f
Ian Lake [Thu, 20 Apr 2017 13:39:13 +0000 (13:39 +0000)]
Create a valid ActivityOptions Bundle even for default animations am:
b759bd3b4a
am:
d85e60aa46
Change-Id: I4c863de66246d6d9a6c64ea1e428094a15c682c1
Ian Lake [Thu, 20 Apr 2017 13:37:42 +0000 (13:37 +0000)]
Remove scale up animation for startActivity from RemoteViews am:
95b193fdca
am:
594f401e26
Change-Id: Ifd958d94b0032d486e01e1be8d44d1b68ca1c4b7
Android Build Merger (Role) [Thu, 20 Apr 2017 13:37:05 +0000 (13:37 +0000)]
Merge "Merge "Change ANDROID_ID for Instant Apps" into oc-dev am:
904e6cad28 am:
97eecf8d09"
Chad Brubaker [Thu, 20 Apr 2017 13:34:06 +0000 (13:34 +0000)]
Merge "Change ANDROID_ID for Instant Apps" into oc-dev am:
904e6cad28
am:
97eecf8d09
Change-Id: Ibbea27ef27bfaa43649d0ff86e23f0ffd559d7f6
Android Build Merger (Role) [Thu, 20 Apr 2017 13:33:49 +0000 (13:33 +0000)]
Merge "Merge "Fix issue with unresolved IDs in adaptive icons" into oc-dev am:
7844a34308 am:
90a29fe305"
Adam Lesinski [Thu, 20 Apr 2017 13:31:08 +0000 (13:31 +0000)]
Merge "Fix issue with unresolved IDs in adaptive icons" into oc-dev am:
7844a34308
am:
90a29fe305
Change-Id: Id86baf67c37eba17974f8f15447984e576b75428
Android Build Merger (Role) [Thu, 20 Apr 2017 13:30:45 +0000 (13:30 +0000)]
Merge "Merge "QS BluetoothTile proiritizes connected device" into oc-dev am:
d5dfde890c am:
7b19567564"
tturney [Thu, 20 Apr 2017 13:28:06 +0000 (13:28 +0000)]
Merge "QS BluetoothTile proiritizes connected device" into oc-dev am:
d5dfde890c
am:
7b19567564
Change-Id: I48eda471e06626381d0e89b7aaa49e10b6774189
Android Build Merger (Role) [Thu, 20 Apr 2017 13:27:44 +0000 (13:27 +0000)]
Merge "Merge "Move CompanionDeviceManagerService to a place of its own" into oc-dev am:
992541027b am:
58b0a7d3e9"
Hugo Benichi [Thu, 20 Apr 2017 13:26:36 +0000 (22:26 +0900)]
resolve merge conflicts of
7bbd03be361f to oc-dev-plus-aosp
Conflits were:
- static import section of ConnectivityService
- code deleted in commit
a0385686769c077a163768f1eb3f8df10e30ccd9
Test: built.
Change-Id: I0e026522558f39d8ae6812b62a30f2501923ab86
Eugene Susla [Thu, 20 Apr 2017 13:24:59 +0000 (13:24 +0000)]
Merge "Move CompanionDeviceManagerService to a place of its own" into oc-dev am:
992541027b
am:
58b0a7d3e9
Change-Id: Ief8d667257fec6c14f9626b69431545cb47b5575
Android Build Merger (Role) [Thu, 20 Apr 2017 13:24:37 +0000 (13:24 +0000)]
Merge "Merge "Fix compose shader child local matrix mutation" into oc-dev am:
611fae13df am:
88677af970"
Chris Craik [Thu, 20 Apr 2017 13:21:35 +0000 (13:21 +0000)]
Merge "Fix compose shader child local matrix mutation" into oc-dev am:
611fae13df
am:
88677af970
Change-Id: I68729ff5415f329feeabb160c0308ecbe3d8fb3f
Android Build Merger (Role) [Thu, 20 Apr 2017 13:21:15 +0000 (13:21 +0000)]
Merge "Merge "Don't show starting window for overlay activities" into oc-dev am:
57d0c0bb43 am:
6a9ffcacf5"
Wale Ogunwale [Thu, 20 Apr 2017 13:18:40 +0000 (13:18 +0000)]
Merge "Don't show starting window for overlay activities" into oc-dev am:
57d0c0bb43
am:
6a9ffcacf5
Change-Id: I9de9a397d5ba9122a79632b13d0c2d45c141c00d
Android Build Merger (Role) [Thu, 20 Apr 2017 13:18:12 +0000 (13:18 +0000)]
Merge "Merge "Flesh out more API docs." into oc-dev am:
3a427c3bd9 am:
750d6d12f6"
TreeHugger Robot [Thu, 20 Apr 2017 13:17:02 +0000 (13:17 +0000)]
Merge "Do not check user escrow state if synthetic password is not enabled yet"
Jeff Sharkey [Thu, 20 Apr 2017 13:15:28 +0000 (13:15 +0000)]
Merge "Flesh out more API docs." into oc-dev am:
3a427c3bd9
am:
750d6d12f6
Change-Id: I3778fa0ead9c23909875f88f7debba1f56c867a0
Jerry Zhang [Thu, 20 Apr 2017 13:11:48 +0000 (13:11 +0000)]
Merge "Only send HOST_STATE intents when host mode is used." into oc-dev am:
a73f9f874a
am:
bf51f836ae
Change-Id: Ie358c38f98d186ed0197248fcf82db2913cfe97d
Abodunrinwa Toki [Thu, 20 Apr 2017 13:08:47 +0000 (13:08 +0000)]
Merge "TRON: Log "textAssist" actions." into oc-dev
Salvador Martinez [Thu, 20 Apr 2017 13:07:32 +0000 (13:07 +0000)]
Merge "Up the character limit for thermal strings" into oc-dev am:
95cdc61248
am:
cc1e8bce91
Change-Id: I46709c2743dfdb93c838dd86ab658eff35d451e4
Philipp Weiß [Thu, 20 Apr 2017 13:05:28 +0000 (13:05 +0000)]
Merge "Redesign QSSecurityFooter dialog"
TreeHugger Robot [Thu, 20 Apr 2017 13:02:17 +0000 (13:02 +0000)]
Merge "String fixes in QSFooter"
Erik Kline [Thu, 20 Apr 2017 13:00:52 +0000 (13:00 +0000)]
Merge "Add local-only hotspot info into tether state change broadcast" am:
4c7a999d79
am:
6af3dd0fc3
Change-Id: Icef7c38313576219b4a55eb10648297b18597ef6
TreeHugger Robot [Thu, 20 Apr 2017 12:59:31 +0000 (12:59 +0000)]
Merge "Add shell command for turning on/off WebView multiprocess." into oc-dev
Erik Kline [Thu, 20 Apr 2017 12:55:48 +0000 (12:55 +0000)]
Merge "Add local-only hotspot info into tether state change broadcast"
am:
4c7a999d79
Change-Id: I911be691b15604a63aa02bf4db607ae1cd701cfe
Jeff Hao [Thu, 20 Apr 2017 12:55:38 +0000 (12:55 +0000)]
Merge "Handle shared libraries for split apks." into oc-dev am:
e2c6cbbd72
am:
cb3d808e18
Change-Id: Id91e4f53f15b7c3899af6680880f86cb97a856ab
Hugo Benichi [Thu, 20 Apr 2017 12:53:22 +0000 (12:53 +0000)]
Merge "ConnectivityManager: remove obsolete callback types" am:
458f75ef69
am:
23ee1621c7
Change-Id: Ib7ff014bd0b7729ca2d02956c190f368963ff632
TreeHugger Robot [Thu, 20 Apr 2017 12:52:39 +0000 (12:52 +0000)]
Merge "Api Council: hide FontsContract.Columns constructor" into oc-dev
Eugene Susla [Thu, 20 Apr 2017 12:50:25 +0000 (12:50 +0000)]
Merge "Make javadoc of companion service name more like others" into oc-dev am:
4d95e40bb3
am:
aaa64afd83
Change-Id: Idbae279855b0851cf53fc1a7e17594a0590acbf3
Treehugger Robot [Thu, 20 Apr 2017 12:47:53 +0000 (12:47 +0000)]
Merge "Add local-only hotspot info into tether state change broadcast"
Hugo Benichi [Thu, 20 Apr 2017 12:47:44 +0000 (12:47 +0000)]
Merge "ConnectivityManager: remove obsolete callback types"
am:
458f75ef69
Change-Id: I180b5ae5890172f14dd910ce3ef3d1c907e3475b
Jeff Sharkey [Thu, 20 Apr 2017 12:46:37 +0000 (12:46 +0000)]
Merge "Some folks like sending null fields." into oc-dev am:
9a1967e157
am:
218c2135b6
Change-Id: I56fe999c3edb167aac57284700d3ccbbc5d4f9ea
Seigo Nonaka [Thu, 20 Apr 2017 12:42:11 +0000 (12:42 +0000)]
Merge "Add comment to Typeface.Builder about file descriptor." into oc-dev am:
f3157e1692
am:
39b5ad8411
Change-Id: Ia159ba2bff5cc333e6945d05291002ab8669c612
Hugo Benichi [Thu, 20 Apr 2017 12:38:27 +0000 (12:38 +0000)]
Merge "ConnectivityManager: remove obsolete callback types"
Matt Sarett [Thu, 20 Apr 2017 12:37:24 +0000 (12:37 +0000)]
Merge "Add unit test for Skia path behavior" into oc-dev am:
dc3ab163d3
am:
515222acd2
Change-Id: I214885c57e77ffd8a991478c96fb70582ce43e6c
TreeHugger Robot [Thu, 20 Apr 2017 12:05:46 +0000 (12:05 +0000)]
Merge "Add more explicit documentation for install reason"
Rubin Xu [Wed, 12 Apr 2017 17:02:44 +0000 (18:02 +0100)]
Do not check user escrow state if synthetic password is not enabled yet
1. when adding escrow tokens, do not throw SecurityException if the user hasn't
migrated to synthetic password yet.
2. during migration, activate any pending escrow tokens.
3. Disable escrow before attempting to activate escrow tokens, this currently
includes whenever the user authenticates, and when synthetic password
migration happens.
Also, add some comments in SyntheticPasswordManager and remove an invalid call
to destroy escrow data.
Test: runtest frameworks-services -c com.android.server.SyntheticPasswordTests
Bug:
36776133
Change-Id: If4b9d385fb43e09d90b6dde6d25b4fcc0c6b7ddc
OSDN Git Service
