Commit Graph

309172 Commits

Author SHA1 Message Date
TreeHugger Robot
6305ebd6dd Merge "hotspot2: fix typo in the getter functions" 2017-02-08 20:52:39 +00:00
Roshan Pius
65eef762a9 Merge changes If970d851,I5bd11574
am: 3c054697fc

Change-Id: I2794ca0e7dfaaf10a47862a4646483772a530b5e
2017-02-08 20:50:02 +00:00
Roshan Pius
aabb1c7ecf WifiManager: API upates for O
am: fb441f5009

Change-Id: I00207a5219d97c49b1231610ad78f7ec4cbe0b96
2017-02-08 20:49:57 +00:00
Roshan Pius
51641c20b2 WifiConfiguration: Remove priority field
am: 45491113ed

Change-Id: I2dd6f7f7b1912259b646a715049164b48334d5b4
2017-02-08 20:49:13 +00:00
songjinshi
bf99f78a38 Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85 am: ec69bd0aa3 am: 36bcc913f7
am: 78a3d9dab4

Change-Id: I421bf706b51fb657855dbc71a13919982e70fd44
2017-02-08 20:42:42 +00:00
Erik Wolsheimer
8edf9d8c4b DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked am: 84aa5a864f am: 7600235339
am: a9492dcfdd  -s ours

Change-Id: I766015ee47f4732cdadea7b36d9007a3f0920864
2017-02-08 20:41:28 +00:00
Paul Duffin
5701db93d6 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
2017-02-08 20:40:18 +00:00
Paul Lawrence
722ec540a2 Merge "Expand seccomp whitelist" am: fd77a331eb am: 1201ce98dd am: e9799155c9
am: e0c1cde9c2

Change-Id: Iadf2fa37a64074f306b5b6ddb4d8c81644c3383d
2017-02-08 20:39:08 +00:00
Treehugger Robot
3c054697fc Merge changes If970d851,I5bd11574
* changes:
  WifiManager: API upates for O
  WifiConfiguration: Remove priority field
2017-02-08 20:38:14 +00:00
Tyler Gunn
00f033f234 Merge "Add support for wait-on-handlers command." am: da6d683caa am: a3b4985ad4 am: 3e086be542
am: 8d2d9d758f

Change-Id: Ib2373609eb15e65ae86e14e081c72909d1fd5808
2017-02-08 20:37:32 +00:00
Julia Reynolds
74856c4a61 Retrieving groups shouldn't have side effects
Test: runtest systemui-notification, viewing settings
Change-Id: Ib43fe6ad2af4763b633ad1690f69d17533915dbb
2017-02-08 20:35:14 +00:00
Winson Chung
96b7a51de8 Fixing NPE when there is no running activity.
Bug: 30668904
Test: Boot the device, kill launcher
Change-Id: I10236d33c7fbc1d20b5d4b097e0660596188eaf0
2017-02-08 12:31:31 -08:00
songjinshi
78a3d9dab4 Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85 am: ec69bd0aa3
am: 36bcc913f7

Change-Id: Icf40ff98196d885e6974eb679532064b30bc68cd
2017-02-08 20:28:48 +00:00
songjinshi
36bcc913f7 Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85
am: ec69bd0aa3

Change-Id: Idfe455733dd12bf82c31cb505681e4fa89d57bfb
2017-02-08 20:22:26 +00:00
Daniel Nishi
bd8c6652cd Don't show game and music apps in Other Apps.
Bug: 35143240
Test: SettingsLib Robotest
Change-Id: Ifaa086373d27dc81203137d20fa1617df21f6093
2017-02-08 12:20:12 -08:00
TreeHugger Robot
4127c138e1 Merge "FloatingToolbar: Support for menu groups." 2017-02-08 20:19:52 +00:00
Erik Wolsheimer
a9492dcfdd DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked am: 84aa5a864f
am: 7600235339

Change-Id: I04996cdf09f06dd4267693eea2ed1ee75239ea90
2017-02-08 20:19:41 +00:00
Paul Duffin
c02f6bb64b Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am: 78a20be77a am: 9e99b9ee45
am: 9250814fd2

Change-Id: Ifd924bdb62102657bf0c6d4b07ab919cf0f96c0c
2017-02-08 20:18:34 +00:00
songjinshi
ec69bd0aa3 Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile."
am: b6f7a85b85

Change-Id: Iea79127b2c7d823844406f677a98fea54043f4cb
2017-02-08 20:18:13 +00:00
Paul Lawrence
e0c1cde9c2 Merge "Expand seccomp whitelist" am: fd77a331eb am: 1201ce98dd
am: e9799155c9

Change-Id: If9652ab58b37d2011251345bf5e85afdb3bac4d6
2017-02-08 20:17:35 +00:00
Erik Wolsheimer
93fa34b156 DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked am: 84aa5a864f am: 36008dd6bd
am: 39c36cab3a  -s ours

Change-Id: I2d0cf6c333eb30eec757d27e9d1be7ed9fa7283b
2017-02-08 20:16:21 +00:00
Tyler Gunn
8d2d9d758f Merge "Add support for wait-on-handlers command." am: da6d683caa am: a3b4985ad4
am: 3e086be542

Change-Id: Ib704d3d5c67b987e4daa375c6ca7f2b1a5d8fdbb
2017-02-08 20:16:15 +00:00
TreeHugger Robot
d927a0e24e Merge "New internal interface method to get the active scorer metadata." 2017-02-08 20:12:54 +00:00
Treehugger Robot
b6f7a85b85 Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." 2017-02-08 20:11:23 +00:00
Fan Zhang
73b161ddc1 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
2017-02-08 12:02:52 -08:00
TreeHugger Robot
a0db8b655f Merge "Fixing small issues with drag-to-dismiss window." 2017-02-08 20:01:27 +00:00
Erik Wolsheimer
39c36cab3a DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked am: 84aa5a864f
am: 36008dd6bd

Change-Id: Ia7e636049d4a3a0490013a54ffb90d7f4f534949
2017-02-08 20:01:24 +00:00
Yohei Yukawa
7fa65eef20 Avoid sync IPCs from TSMS to SpellCheckerService
Currently, TextServicesManagerServices uses an AIDL interface called
ISpellCheckerService when binding to a spell-checking service.
However, this interface uses synchronous (blocking) binder calls
rather than asynchronous (oneway) calls.  As a result, there are
situations where the system process has made a blocking binder call
into untrusted application code from its main looper thread.

As general policy, the system process must never allow its looper
threads to block on application code.

This CL addresses the above issue by converting ISpellCheckerService
into oneway interface, which instead takes a result receiver
ISpellCheckerServiceCallback so that spell-checking services can
return results asynchronously.

Note that the above protocol issue was also the root cause of
Bug 5471520.  Hence we can also logically revert the previous CL [1]
for Bug 5471520.

 [1]: Iedf2c2cdd8d4834545d06d72ade3ce211b104b1d
      4e713f1441

Test: Ran `adb shell dumpsys textservices` to check the
      "Spell Checker Bind Groups:" section in the following three
      steps.
      1. Before apps start requesting spell checker sessions.
      2. While apps are owning active spell checker sessions.
      3. After all the apps that owned spell checker sessions are
         gone.
      Made sure that spell checker service is not running when
      there is not spell checker bind group.
Bug: 7254002
Change-Id: I92e7aa40dc9ea14f67d355f0bfa15325b775d27b
2017-02-08 11:54:05 -08:00
Julia Reynolds
49f38bb487 Merge "Don't let apps permanently delete channels." 2017-02-08 19:50:49 +00:00
Erik Wolsheimer
7600235339 DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked
am: 84aa5a864f

Change-Id: I9b5c9b25a9bd4ad5b51f7d0c7004c7275ce1e460
2017-02-08 19:46:50 +00:00
Erik Wolsheimer
36008dd6bd DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked
am: 84aa5a864f

Change-Id: Ibcbaba3bb406e07f97561bc87916f6891fc25b74
2017-02-08 19:46:49 +00:00
Sergio Sancho
7c810edbce Merge "Ensure default pitch is used when none is specified." 2017-02-08 19:28:55 +00:00
George Mount
a42f8e41ee Delay changing state of added fragments until all executed.
Bug 34963118

When popping multiple transactions, all added fragments
should wait until all transactions are executed before
moving their states to the final state.

This CL brings back the behavior of executing all operations
first before changing the state of added fragments. This means
that intermediate fragments won't be created when popping.

Test: I11da5229bc7104ddc683e1d7d8d929c9db3f5686
Change-Id: I472860cfe94a33db42e9a1d3727213ab5d5075e7
2017-02-08 11:26:09 -08:00
Wale Ogunwale
1a81a63b81 Merge "Fixed failing WM pre-submit tests" 2017-02-08 19:22:02 +00:00
TreeHugger Robot
54f9672986 Merge "Use the Context name to publish and use vrmanager" 2017-02-08 19:09:51 +00:00
Peter Qiu
8dee619860 hotspot2: fix typo in the getter functions
Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: If833fb06cead7df9d631b3b12d66d05b8422d46c
2017-02-08 11:01:43 -08:00
Ray Essick
242ca74094 Merge "API android.media.MediaExtractor.getMetrics()" 2017-02-08 18:58:23 +00:00
Paul Duffin
9250814fd2 Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am: 78a20be77a
am: 9e99b9ee45

Change-Id: I289950cff0cdc6b5ad301936c7b55eadee5fd0f8
2017-02-08 18:30:17 +00:00
Paul Lawrence
e9799155c9 Merge "Expand seccomp whitelist" am: fd77a331eb
am: 1201ce98dd

Change-Id: I87fa2d6962ebb288c8c79488cfaf73485fca7bbf
2017-02-08 18:29:08 +00:00
Tyler Gunn
3e086be542 Merge "Add support for wait-on-handlers command." am: da6d683caa
am: a3b4985ad4

Change-Id: I80669c442c53a49687974851dccf0c9c9b500e96
2017-02-08 18:27:37 +00:00
Eugene Susla
d5015bec23 Merge "Companion device chooser UI enchancements" 2017-02-08 18:22:01 +00:00
Paul Duffin
9e99b9ee45 Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
am: 78a20be77a

Change-Id: I6f32dc27f70e4c22d25ec6bd2eec715700ebbd89
2017-02-08 18:14:50 +00:00
Dan Sandler
6cfde40234 Fix regression in battery size.
The aspect ratio of the intrinsic dimensions resulted in a
too-short battery.

Test: visual
Change-Id: I31cc36d1efad5cc9b086b90eb857a08eee181677
2017-02-08 10:10:47 -08:00
Dan Sandler
6aa6e6e640 Clean up BatteryMeterDrawable internal api.
Bug: 32539932
Test: runtest -x frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java
Test: runtest -x frameworks/base/packages/SystemUI/tests/src/com/android/systemui/BatteryMeterDrawableTest.java
Change-Id: Ifdc3368b930abcf248b60ee99f6f9139ad804f91
2017-02-08 10:10:46 -08:00
Paul Lawrence
1201ce98dd Merge "Expand seccomp whitelist"
am: fd77a331eb

Change-Id: I824c984b907e43248d6eba6259f31f4aab7d64db
2017-02-08 18:10:28 +00:00
Paul Duffin
78a20be77a Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" 2017-02-08 18:06:08 +00:00
TreeHugger Robot
77aee7128d Merge "Don't print shader source" 2017-02-08 18:00:26 +00:00
Paul Lawrence
fd77a331eb Merge "Expand seccomp whitelist" 2017-02-08 17:57:42 +00:00
Salvador Martinez
5457217e2c Merge "moved shared classes from settings to settingslib" 2017-02-08 17:57:13 +00:00
TreeHugger Robot
d0e1022237 Merge "SysUI: Add method for plugins to keep status bar full screen" 2017-02-08 17:53:53 +00:00