OSDN Git Service
Bill Yi [Thu, 9 Feb 2017 11:40:51 +0000 (11:40 +0000)]
Import translations. DO NOT MERGE am:
d0bc779893 -s ours
am:
49e6b18eeb -s ours
Change-Id: Ib68c0f50355c4d87be79078542696de7e1e4cb4f
Bill Yi [Thu, 9 Feb 2017 11:36:52 +0000 (11:36 +0000)]
Import translations. DO NOT MERGE
am:
d0bc779893 -s ours
Change-Id: I06ce169e1bebd7c4543090b2ba0c3b119121d954
Peeyush Agarwal [Thu, 9 Feb 2017 11:17:20 +0000 (11:17 +0000)]
Merge "Extend MenuItem to allow modifier keys for shortcut"
Bill Yi [Thu, 9 Feb 2017 09:57:11 +0000 (01:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I751a4937bc2753f50aaf1177868c9199e8d201ec
Auto-generated-cl: translation import
Martijn Coenen [Thu, 9 Feb 2017 08:55:20 +0000 (08:55 +0000)]
Merge "Don't generate and send reply object in oneway calls." am:
60f11f3d16 am:
14cc9c291e am:
53e5640589
am:
b2c70c8877
Change-Id: I3e3d29f938ac86852b1353697009dec9cad545ee
Martijn Coenen [Thu, 9 Feb 2017 08:51:12 +0000 (08:51 +0000)]
Merge "Don't generate and send reply object in oneway calls." am:
60f11f3d16 am:
14cc9c291e
am:
53e5640589
Change-Id: I3ee89a098a2913f5ce7f4c357b9c5c86f4bd4b15
Martijn Coenen [Thu, 9 Feb 2017 08:47:12 +0000 (08:47 +0000)]
Merge "Don't generate and send reply object in oneway calls." am:
60f11f3d16
am:
14cc9c291e
Change-Id: I415b895812703aa8ec290234fb71d1d0a89aece9
Martijn Coenen [Thu, 9 Feb 2017 08:42:27 +0000 (08:42 +0000)]
Merge "Don't generate and send reply object in oneway calls."
am:
60f11f3d16
Change-Id: I790576158c1d2cae6b746f3b5d0dbecad750629a
Martijn Coenen [Thu, 9 Feb 2017 08:37:29 +0000 (08:37 +0000)]
Merge "Don't generate and send reply object in oneway calls."
Martijn Coenen [Wed, 8 Feb 2017 09:22:28 +0000 (10:22 +0100)]
Don't generate and send reply object in oneway calls.
Bug:
35044790
Test: hidl_test, hidl_test_java
Change-Id: Iae8f5b071f89d2af5ca15360c6a1a0fbf8040e77
TreeHugger Robot [Thu, 9 Feb 2017 08:25:33 +0000 (08:25 +0000)]
Merge "Fix ImeSubtypeListItem ordering"
TreeHugger Robot [Thu, 9 Feb 2017 06:23:29 +0000 (06:23 +0000)]
Merge "Serially (un/)register score cache in WifiTracker."
Chris Tate [Thu, 9 Feb 2017 06:12:34 +0000 (06:12 +0000)]
Merge "Whitelist LocalTransport here in the framework sysconfig"
TreeHugger Robot [Thu, 9 Feb 2017 05:43:23 +0000 (05:43 +0000)]
Merge "Make datasets one line and ellipsized."
Chris Tate [Thu, 9 Feb 2017 05:33:15 +0000 (05:33 +0000)]
Merge "Enable background restrictions"
Yohei Yukawa [Thu, 9 Feb 2017 05:11:01 +0000 (05:11 +0000)]
Merge "Avoid sync IPCs from TSMS to SpellCheckerService"
Sundeep Ghuman [Thu, 9 Feb 2017 01:19:27 +0000 (17:19 -0800)]
Serially (un/)register score cache in WifiTracker.
Before the cache unregistration logic was posted to the worker thread.
However, when WifiSettings is quit, the onDestroy method immediately
kills the WorkHandler. This caused unregistration to never occur, which
left the cache registered and the listener to try to post work on the
dead worker thread. The cache is now registered and unregistered
serially in start and stop tracking, respectively. Furthermore, the
cachelistener is running on the mainHandler as it is a lightweight task
(posting to work handler).
Bug:
34891717
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I7739fdbe036be5b2870be45f33f670fd69d69af1
Tadashi G. Takaoka [Wed, 8 Feb 2017 06:12:13 +0000 (15:12 +0900)]
Fix ImeSubtypeListItem ordering
The previous CL (I47f902cc8f) fixed ImeSubtypeListItem.compareTo() is
compliant to Comparable#compareTo(T) (Bug
34255739) and introduced the
following order of comparing ImeSubtypeListItem fields.
1. ImeSubtypeListItem#mImeName
2. ImeSubtypeListItem#mSubtypeName
3. ImeSubtypeListItem#mIsSystemLocale
4. ImeSubtypeListItem#mIsSystemLanguage
But it didn't keep the previous ordering (Bug
34821121). This CL
fixes the order of comparing ImeSubtypeListItem fields as compatible
as ones before I47f902cc8f.
1. ImeSubtypeListItem#mImeName
2. ImeSubtypeListItem#mIsSystemLocale
3. ImeSubtypeListItem#mIsSystemLanguage
4. ImeSubtypeListItem#mSubtypeName
Bug:
34255739
Fixes:
34821121
Test: Install FramewroksCoreTests.apk and run
InputMethodSubtypeSwitchingControllerTest and verify all tests passed.
Change-Id: I813403fd29c5c52a3ca375174ec4b95e4b5433f2
TreeHugger Robot [Thu, 9 Feb 2017 02:48:33 +0000 (02:48 +0000)]
Merge "Work on separating out the status bar management"
TreeHugger Robot [Thu, 9 Feb 2017 02:35:16 +0000 (02:35 +0000)]
Merge "Add command line options for some new intent flags."
TreeHugger Robot [Thu, 9 Feb 2017 02:17:14 +0000 (02:17 +0000)]
Merge "Fixing issue with play/pause buttons being inverted."
Christopher Tate [Thu, 9 Feb 2017 01:56:29 +0000 (17:56 -0800)]
Enable background restrictions
Can be disabled by setting the "debug.bgcheck" system property to
"n" or "no" or "0" or "false" or "off". (Writing that property
requires root.)
Bug
30953212
Test: observed restrictions being enforced
Change-Id: I4cda9b7840ff25240b6bcaab210ea13888d08cad
Jason Monk [Fri, 27 Jan 2017 22:00:29 +0000 (17:00 -0500)]
Work on separating out the status bar management
Lots of stuff:
- Make StatusBarIconController be a permanent dependency
- Break out dark stuff into DarkIconDispatcher
- Create StatusBarFragment
- This bit is a bit ugly for now, but will be better later
- Other stuff probably
Test: runtest systemui
Change-Id: I4973bc9f944e66af92731bf1edd2b39657f1782f
Christopher Tate [Wed, 8 Feb 2017 22:26:50 +0000 (14:26 -0800)]
Whitelist LocalTransport here in the framework sysconfig
This shouldn't properly be emplaced as a side-effect of partner-
specific configurations; so now we don't do that any more.
Bug
35151478
Test: verify whitelist contents with 'bmgr whitelist'
Change-Id: I854ddfdbcec1def882b24f5ea7955b28d4789806
Dianne Hackborn [Thu, 9 Feb 2017 00:33:43 +0000 (16:33 -0800)]
Add command line options for some new intent flags.
Forgot to add these when the flags were added.
Test: manual
Change-Id: If71ea756ca85946155d7a6848454f61d137138c0
TreeHugger Robot [Thu, 9 Feb 2017 00:25:23 +0000 (00:25 +0000)]
Merge "Check for null inputs in the ctor."
Dianne Hackborn [Thu, 9 Feb 2017 00:10:57 +0000 (00:10 +0000)]
Merge "Add new VoiceInteractionSession.setUiEnabled method"
Greg Plesur [Thu, 9 Feb 2017 00:03:12 +0000 (00:03 +0000)]
Merge "Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am:
8a2ea2cf83 am:
ddec36e31a" into nyc-mr2-dev-plus-aosp
am:
c296020f55
Change-Id: I98f4fac8b063ebec21271e5b46ff3027305c1165
Greg Plesur [Thu, 9 Feb 2017 00:03:03 +0000 (00:03 +0000)]
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am:
8a2ea2cf83 am:
ddec36e31a
am:
50447143c2
Change-Id: Iadf6f2217415d0498254eb4d1669c5f93ac8a9d0
Greg Plesur [Thu, 9 Feb 2017 00:01:44 +0000 (00:01 +0000)]
Merge "Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am:
8a2ea2cf83 am:
58fce5386b" into nyc-mr2-dev-plus-aosp
am:
735e8230ad
Change-Id: I96ba158ea11611e5d4d82d4ad36af0676b64592a
Greg Plesur [Thu, 9 Feb 2017 00:01:39 +0000 (00:01 +0000)]
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am:
8a2ea2cf83 am:
58fce5386b
am:
5d9343b60a
Change-Id: I2d163d2a3eb1edfd0329992ae5c98c9b11cd9ad5
Greg Plesur [Thu, 9 Feb 2017 00:00:08 +0000 (00:00 +0000)]
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked() am:
c7b18342ea am:
66af3515de
am:
7658c60e91
Change-Id: Ic433afeb6b791173c90546da98ce7bdddfdd5629
Greg Plesur [Wed, 8 Feb 2017 23:56:33 +0000 (23:56 +0000)]
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked() am:
c7b18342ea am:
b6323817db
am:
f206de957a
Change-Id: Ic1f2bd765ecc3eb7239923147a93fc4afa6eb70c
Android Build Merger (Role) [Wed, 8 Feb 2017 23:54:08 +0000 (23:54 +0000)]
Merge "Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am:
8a2ea2cf83 am:
ddec36e31a" into nyc-mr2-dev-plus-aosp
Greg Plesur [Wed, 8 Feb 2017 23:53:29 +0000 (23:53 +0000)]
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am:
8a2ea2cf83
am:
ddec36e31a
Change-Id: Id36db178cad26adba0a43370af2f4f6cdd1a0443
Android Build Merger (Role) [Wed, 8 Feb 2017 23:53:15 +0000 (23:53 +0000)]
Merge "Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am:
8a2ea2cf83 am:
58fce5386b" into nyc-mr2-dev-plus-aosp
Greg Plesur [Wed, 8 Feb 2017 23:52:35 +0000 (23:52 +0000)]
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked() am:
c7b18342ea
am:
66af3515de
Change-Id: I6e97c2c08b8773c9b0f3a472c8f679cc23e8e365
Greg Plesur [Wed, 8 Feb 2017 23:52:32 +0000 (23:52 +0000)]
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am:
8a2ea2cf83
am:
58fce5386b
Change-Id: I784fc51c541da12056f7c47810d3b222f40dea04
Greg Plesur [Wed, 8 Feb 2017 23:49:32 +0000 (23:49 +0000)]
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked() am:
c7b18342ea
am:
b6323817db
Change-Id: I5f3b6935af32ba94fef35d8db573d75925eee434
Andrew Sapperstein [Wed, 8 Feb 2017 23:47:50 +0000 (23:47 +0000)]
Merge "Add additional logging for temperature readings." into nyc-mr2-dev am:
759e1c5219
am:
241ee625bf -s ours
Change-Id: I3030b8c618d2a213f14bd3b79951f52c9a7c1f20
Andrew Sapperstein [Wed, 8 Feb 2017 23:46:33 +0000 (23:46 +0000)]
Add additional logging for temperature readings. am:
4cfe56709b
am:
0d86733ab7 -s ours
Change-Id: I10aef54ae8edc77a3c9258b135225e609dc7db18
Greg Plesur [Wed, 8 Feb 2017 23:44:34 +0000 (23:44 +0000)]
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev
am:
8a2ea2cf83
Change-Id: Ie25c9bfa82ccffc58b68c13b515d7f556d955289
Greg Plesur [Wed, 8 Feb 2017 23:44:27 +0000 (23:44 +0000)]
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()
am:
c7b18342ea
Change-Id: I1969d32950057ecacc03e8c5d00ad185fb627044
Greg Plesur [Wed, 8 Feb 2017 23:44:17 +0000 (23:44 +0000)]
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev
am:
8a2ea2cf83
Change-Id: I9c2c3d822023277aada4685a11f4b272585550ea
Greg Plesur [Wed, 8 Feb 2017 23:44:13 +0000 (23:44 +0000)]
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()
am:
c7b18342ea
Change-Id: I692fee4165de9a274d8eb8f0deaf49762974bb22
Andrew Sapperstein [Wed, 8 Feb 2017 23:37:26 +0000 (23:37 +0000)]
Merge "Add additional logging for temperature readings." into nyc-mr2-dev
am:
759e1c5219
Change-Id: Id598870f05298933d4ef053e0ea3b37113e01f65
Andrew Sapperstein [Wed, 8 Feb 2017 23:37:19 +0000 (23:37 +0000)]
Add additional logging for temperature readings.
am:
4cfe56709b
Change-Id: I57547d77357deaa663c482937f26890930dc8845
TreeHugger Robot [Wed, 8 Feb 2017 23:36:06 +0000 (23:36 +0000)]
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev
TreeHugger Robot [Wed, 8 Feb 2017 23:31:13 +0000 (23:31 +0000)]
Merge "Add additional logging for temperature readings." into nyc-mr2-dev
Jeremy Joslin [Wed, 8 Feb 2017 22:50:34 +0000 (14:50 -0800)]
Check for null inputs in the ctor.
Test: gts-tradefed run gts -m GtsGmscoreHostTestCases -t com.google.android.gts.wifi.WifiHostTest
Bug:
35152108
Change-Id: I321b52b0feb62aced20bca7f47e962f5c7d78343
TreeHugger Robot [Wed, 8 Feb 2017 22:33:44 +0000 (22:33 +0000)]
Merge "Fix a crash when opening app data usage for work profile"
Jean-Michel Trivi [Wed, 8 Feb 2017 22:28:42 +0000 (22:28 +0000)]
Merge "AudioService: mute media/game players during phone calls"
Evan Rosky [Wed, 8 Feb 2017 22:27:49 +0000 (22:27 +0000)]
Merge "Separate cluster-focus and default-focus."
Tyler Gunn [Wed, 8 Feb 2017 22:10:20 +0000 (22:10 +0000)]
Merge "Change prototype for "setCamera" in IMS VideoProvider." am:
c164b159f8 am:
e55b11573e am:
998655f80e
am:
58d8c5eb07 -s ours
Change-Id: Ic1f76d23f1d0c28c74cbea392a3998181d9d6da7
Tyler Gunn [Wed, 8 Feb 2017 22:05:45 +0000 (22:05 +0000)]
Merge "Change prototype for "setCamera" in IMS VideoProvider." am:
c164b159f8 am:
e55b11573e
am:
998655f80e
Change-Id: I01c5d8c15ce9377f126fc7268bd1a8ecee602dc8
Daniel Sandler [Wed, 8 Feb 2017 22:03:11 +0000 (22:03 +0000)]
Merge changes from topic 'battery3'
* changes:
Fix regression in battery size.
Clean up BatteryMeterDrawable internal api.
Tyler Gunn [Wed, 8 Feb 2017 22:01:07 +0000 (22:01 +0000)]
Merge "Change prototype for "setCamera" in IMS VideoProvider." am:
c164b159f8
am:
e55b11573e
Change-Id: Iffef42c4050bbda451e9cd99cb90589060b105bd
Dianne Hackborn [Tue, 7 Feb 2017 01:42:41 +0000 (17:42 -0800)]
Add new VoiceInteractionSession.setUiEnabled method
This allows the session to turn off all of its UI. Use it
in onCreate() to prevent the session from ever creating any
of its UI. Switched the window creation and initialization to
happen lazily to support this.
Test: New test added to android.assist.cts.LifecycleTest
Bug:
30999386
Change-Id: I8eacb3697c8ac9908c50b9577abea2d20597b016
Tyler Gunn [Wed, 8 Feb 2017 21:56:39 +0000 (21:56 +0000)]
Merge "Change prototype for "setCamera" in IMS VideoProvider."
am:
c164b159f8
Change-Id: I3abbb1de951f65c226a6849f34946880e9f650ff
TreeHugger Robot [Wed, 8 Feb 2017 21:56:15 +0000 (21:56 +0000)]
Merge "Fix typo in ScoredNetwork javadoc."
Treehugger Robot [Wed, 8 Feb 2017 21:46:43 +0000 (21:46 +0000)]
Merge "Change prototype for "setCamera" in IMS VideoProvider."
Greg Plesur [Wed, 8 Feb 2017 19:57:34 +0000 (14:57 -0500)]
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()
BUG:
34824902
Change-Id: I49d4d7043829862e1abacb3f400a6690f454d6c0
TreeHugger Robot [Wed, 8 Feb 2017 21:32:40 +0000 (21:32 +0000)]
Merge "Delay changing state of added fragments until all executed."
TreeHugger Robot [Wed, 8 Feb 2017 21:32:14 +0000 (21:32 +0000)]
Merge "Retrieving groups shouldn't have side effects"
Mathias Agopian [Wed, 8 Feb 2017 21:27:17 +0000 (21:27 +0000)]
Merge "moved GraphicEnv from libgui to libui"
Jason Long [Wed, 8 Feb 2017 20:49:33 +0000 (12:49 -0800)]
Make datasets one line and ellipsized.
Test: Manual
Test: CtsAutoFillServiceTestCases
Change-Id: I2f58ef5e566ba0551431fcbe43efb179c3efc8e8
TreeHugger Robot [Wed, 8 Feb 2017 21:17:14 +0000 (21:17 +0000)]
Merge "Fix NPE when session is finished before service replies."
Roshan Pius [Wed, 8 Feb 2017 21:15:28 +0000 (21:15 +0000)]
Merge changes If970d851,I5bd11574 am:
3c054697fc am:
65eef762a9 am:
6dd6ba628b
am:
b9f9e64619
Change-Id: I7f140b1b3ca363e0a53ffc08b2c6ad9020ecdf45
Roshan Pius [Wed, 8 Feb 2017 21:14:19 +0000 (21:14 +0000)]
WifiManager: API upates for O am:
fb441f5009 am:
aabb1c7ecf am:
02bf13a6c9
am:
ec38eb6988
Change-Id: I1cb223bff8dd29e11316bf69c7f200caac2a125b
Roshan Pius [Wed, 8 Feb 2017 21:13:12 +0000 (21:13 +0000)]
WifiConfiguration: Remove priority field am:
45491113ed am:
51641c20b2 am:
707ced526f
am:
6a4322b6d6
Change-Id: Iae46e33f4d04f8bff3da569670fe2474d22cd80e
Roshan Pius [Wed, 8 Feb 2017 21:08:41 +0000 (21:08 +0000)]
Merge changes If970d851,I5bd11574 am:
3c054697fc am:
65eef762a9
am:
6dd6ba628b
Change-Id: I2e150126a816314c057e31ec5902088814890421
Roshan Pius [Wed, 8 Feb 2017 21:07:48 +0000 (21:07 +0000)]
WifiManager: API upates for O am:
fb441f5009 am:
aabb1c7ecf
am:
02bf13a6c9
Change-Id: I75883c53958f2495a3e906a8940ef2a7ced98ec5
Roshan Pius [Wed, 8 Feb 2017 21:06:45 +0000 (21:06 +0000)]
WifiConfiguration: Remove priority field am:
45491113ed am:
51641c20b2
am:
707ced526f
Change-Id: I294a36db16c8e079cae5b748421dccfbb50dadc4
Roshan Pius [Wed, 8 Feb 2017 21:01:12 +0000 (21:01 +0000)]
Merge changes If970d851,I5bd11574 am:
3c054697fc
am:
65eef762a9
Change-Id: I02a05b3b327b79f9b344db0a3b5d5c96b49bcd5a
Roshan Pius [Wed, 8 Feb 2017 21:00:24 +0000 (21:00 +0000)]
WifiManager: API upates for O am:
fb441f5009
am:
aabb1c7ecf
Change-Id: I0ff9ca3f59b4d10e41fd2d3a38329cc7f71844cf
Roshan Pius [Wed, 8 Feb 2017 20:59:17 +0000 (20:59 +0000)]
WifiConfiguration: Remove priority field am:
45491113ed
am:
51641c20b2
Change-Id: I820420e7c38aac3ddff2441cf40dc367b483c0ff
Andrew Sapperstein [Wed, 8 Feb 2017 20:58:51 +0000 (20:58 +0000)]
Merge "Add additional logging for temperature readings."
TreeHugger Robot [Wed, 8 Feb 2017 20:52:36 +0000 (20:52 +0000)]
Merge "hotspot2: fix typo in the getter functions"
Roshan Pius [Wed, 8 Feb 2017 20:50:02 +0000 (20:50 +0000)]
Merge changes If970d851,I5bd11574
am:
3c054697fc
Change-Id: I2794ca0e7dfaaf10a47862a4646483772a530b5e
Roshan Pius [Wed, 8 Feb 2017 20:49:57 +0000 (20:49 +0000)]
WifiManager: API upates for O
am:
fb441f5009
Change-Id: I00207a5219d97c49b1231610ad78f7ec4cbe0b96
Roshan Pius [Wed, 8 Feb 2017 20:49:13 +0000 (20:49 +0000)]
WifiConfiguration: Remove priority field
am:
45491113ed
Change-Id: I2dd6f7f7b1912259b646a715049164b48334d5b4
songjinshi [Wed, 8 Feb 2017 20:42:42 +0000 (20:42 +0000)]
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am:
b6f7a85b85 am:
ec69bd0aa3 am:
36bcc913f7
am:
78a3d9dab4
Change-Id: I421bf706b51fb657855dbc71a13919982e70fd44
Erik Wolsheimer [Wed, 8 Feb 2017 20:41:28 +0000 (20:41 +0000)]
DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked am:
84aa5a864f am:
7600235339
am:
a9492dcfdd -s ours
Change-Id: I766015ee47f4732cdadea7b36d9007a3f0920864
Paul Duffin [Wed, 8 Feb 2017 20:40:18 +0000 (20:40 +0000)]
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am:
78a20be77a am:
9e99b9ee45 am:
9250814fd2
am:
c02f6bb64b -s ours
Change-Id: If23532663b7cce494d8c9b651e0315522202b832
Paul Lawrence [Wed, 8 Feb 2017 20:39:08 +0000 (20:39 +0000)]
Merge "Expand seccomp whitelist" am:
fd77a331eb am:
1201ce98dd am:
e9799155c9
am:
e0c1cde9c2
Change-Id: Iadf2fa37a64074f306b5b6ddb4d8c81644c3383d
Treehugger Robot [Wed, 8 Feb 2017 20:38:12 +0000 (20:38 +0000)]
Merge changes If970d851,I5bd11574
* changes:
WifiManager: API upates for O
WifiConfiguration: Remove priority field
Tyler Gunn [Wed, 8 Feb 2017 20:37:32 +0000 (20:37 +0000)]
Merge "Add support for wait-on-handlers command." am:
da6d683caa am:
a3b4985ad4 am:
3e086be542
am:
8d2d9d758f
Change-Id: Ib2373609eb15e65ae86e14e081c72909d1fd5808
Julia Reynolds [Wed, 8 Feb 2017 19:47:23 +0000 (14:47 -0500)]
Retrieving groups shouldn't have side effects
Test: runtest systemui-notification, viewing settings
Change-Id: Ib43fe6ad2af4763b633ad1690f69d17533915dbb
songjinshi [Wed, 8 Feb 2017 20:28:48 +0000 (20:28 +0000)]
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am:
b6f7a85b85 am:
ec69bd0aa3
am:
36bcc913f7
Change-Id: Icf40ff98196d885e6974eb679532064b30bc68cd
songjinshi [Wed, 8 Feb 2017 20:22:26 +0000 (20:22 +0000)]
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am:
b6f7a85b85
am:
ec69bd0aa3
Change-Id: Idfe455733dd12bf82c31cb505681e4fa89d57bfb
TreeHugger Robot [Wed, 8 Feb 2017 20:19:48 +0000 (20:19 +0000)]
Merge "FloatingToolbar: Support for menu groups."
Erik Wolsheimer [Wed, 8 Feb 2017 20:19:41 +0000 (20:19 +0000)]
DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked am:
84aa5a864f
am:
7600235339
Change-Id: I04996cdf09f06dd4267693eea2ed1ee75239ea90
Paul Duffin [Wed, 8 Feb 2017 20:18:34 +0000 (20:18 +0000)]
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am:
78a20be77a am:
9e99b9ee45
am:
9250814fd2
Change-Id: Ifd924bdb62102657bf0c6d4b07ab919cf0f96c0c
songjinshi [Wed, 8 Feb 2017 20:18:13 +0000 (20:18 +0000)]
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile."
am:
b6f7a85b85
Change-Id: Iea79127b2c7d823844406f677a98fea54043f4cb
Paul Lawrence [Wed, 8 Feb 2017 20:17:35 +0000 (20:17 +0000)]
Merge "Expand seccomp whitelist" am:
fd77a331eb am:
1201ce98dd
am:
e9799155c9
Change-Id: If9652ab58b37d2011251345bf5e85afdb3bac4d6
Erik Wolsheimer [Wed, 8 Feb 2017 20:16:21 +0000 (20:16 +0000)]
DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked am:
84aa5a864f am:
36008dd6bd
am:
39c36cab3a -s ours
Change-Id: I2d0cf6c333eb30eec757d27e9d1be7ed9fa7283b
Tyler Gunn [Wed, 8 Feb 2017 20:16:15 +0000 (20:16 +0000)]
Merge "Add support for wait-on-handlers command." am:
da6d683caa am:
a3b4985ad4
am:
3e086be542
Change-Id: Ib704d3d5c67b987e4daa375c6ca7f2b1a5d8fdbb
TreeHugger Robot [Wed, 8 Feb 2017 20:12:50 +0000 (20:12 +0000)]
Merge "New internal interface method to get the active scorer metadata."
Treehugger Robot [Wed, 8 Feb 2017 20:11:22 +0000 (20:11 +0000)]
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile."
Fan Zhang [Wed, 8 Feb 2017 19:46:54 +0000 (11:46 -0800)]
Fix a crash when opening app data usage for work profile
The icon on app header is a clone of original app icon, which relies on
getConstantState() of the orginal drawable non-null.
Change-Id: Ice5360f5d00d99b3cfe538b167ce67fc06d5e402
Fix:
34190136
Test: make RunSettingsLibRoboTests
OSDN Git Service
