306897 Commits

Author SHA1 Message Date
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
Craig Donner
8deb67cb64 Use the Context name to publish and use vrmanager
Bug: 34736524
Test: build
Change-Id: I8aabb4d242fb2378b24dd30a972c382a7f8f4934
2017-02-08 09:46:07 -08:00
TreeHugger Robot
3238f730bd Merge "Fix deadlock in render thread when Bitmap.prepareToDraw is invoked" 2017-02-08 17:39:36 +00:00
Daniel Nishi
9fa0a5c478 Merge "Fix a bug where the last used times could be wrong." 2017-02-08 17:32:36 +00:00
Christine Franks
899d76bc19 Merge "Add new MetricsEvent for carrier demo mode dialog" 2017-02-08 17:25:17 +00:00
Tyler Gunn
a3b4985ad4 Merge "Add support for wait-on-handlers command."
am: da6d683caa

Change-Id: I71bee35ec1bf6ff4100f6515ea87dcc89312a689
2017-02-08 17:17:30 +00:00
Felipe Leme
8d918a7149 Fix NPE when session is finished before service replies.
Fixes: 35114623
Test: manual verificaiton
Test: CtsAutoFillServiceTestCases passes
Change-Id: Id38babd038c79dc3e7070483437adec1b415a072
2017-02-08 09:11:21 -08:00
Abodunrinwa Toki
5fedfb8d46 FloatingToolbar: Support for menu groups.
1. Menu groups are now separated by dividers
2. Update to menu item spacing as specified in new UX mocks
3. TextView-Editor now passes the "assist" menu as a group
4. "Share" menu reordered after "Cut/Copy/Paste" as per UX mocks update.

Test: Manual tests.
Bug: 34777048
Bug: 34777833
Change-Id: I3d435d8a38e5b146a54706f12dbf3ff629c504bf
2017-02-08 16:55:26 +00:00
TreeHugger Robot
697221e84d Merge changes Ia7670aa6,I602b421b
* changes:
  Get rid of VirtualViewDelegate.
  Set autofill id on virtual structures.
2017-02-08 16:55:01 +00:00
Roshan Pius
fb441f5009 WifiManager: API upates for O
Deprecate the following API's:
1. pingSupplicant() - We don't want apps trying to figure out if
wpa_supplicant is running or not. It should not be something that
apps need to know.
2. saveConfiguration() - No longer needed, we automatically persist data
when needed.

Other changes:
1. Reworded the docstrings to remove direct reference to wpa_supplicant
for network configuration related API's.
2. We no longer allow apps to modfiy network configuration of other
apps. Added a docstring explaining that in the 3 modify API's.
3. Changed the wording of enableNetwork's |disableOthers| flag.

Bug: 31146757
Test: make update-api
Change-Id: If970d85146de3532072191cb2b7ecb0d5adb2774
2017-02-08 08:51:26 -08:00
TreeHugger Robot
42c401adbd Merge "AssetManager2: Add GetResourceId" 2017-02-08 16:50:33 +00:00
Roshan Pius
45491113ed WifiConfiguration: Remove priority field
This field is no longer used anywhere within wifi framework and hence
removing this from public API.

Bug: 28341078
Test: make update-api
Change-Id: I5bd115742ca610735b00c20f2ffab7590c5f3256
2017-02-08 08:50:29 -08:00
Roshan Pius
4f2eba2a10 Merge changes If970d851,I5bd11574
* changes:
  WifiManager: API upates for O
  WifiConfiguration: Remove priority field
2017-02-08 16:40:39 +00:00
Paul Lawrence
76c20442cf Expand seccomp whitelist
Bug: 35059702
Test: Device boots, app no longer produces SIGSYS failures
Change-Id: I020b625bd7529ad9806c0b23a1ca70bc87906dad
2017-02-08 08:38:45 -08:00
Adam Powell
2ec94fde4f Merge "Provide old behavior for View#hasFocusable to old apps" 2017-02-08 16:21:06 +00:00
Tyler Gunn
da6d683caa Merge "Add support for wait-on-handlers command." 2017-02-08 16:09:09 +00:00
Rubin Xu
b94a914c9e Merge "Small tweaks in LockSettingsService" 2017-02-08 16:04:27 +00:00
Calin Juravle
0c0daaa5c2 Merge "Fix typo in dexopt.secondary system property" 2017-02-08 16:03:08 +00:00
Wale Ogunwale
17f175ca1a Fixed failing WM pre-submit tests
- Pre-submit wasn't really enabled so several changes were merged in
that caused test failures
- Specify that AppWindowTokenTests token fill their parent since that
is important for the orientation tests it runs
- Disable testLandscapeSeascapeRotationByPolicy() until we have time
to figure-out the problem with the test.
- Initialize ActivityManagerInternal local service mock when we
initialize the test object for window manager.
- Changed UnknownAppVisibilityControllerTest to use test
infrastructure in WindowTestsBase.
- Fixed testGetOrientation_childSpecified to check the correct expected
state.
- Allow testAssignWindowLayers_ForImeNonAppImeTarget to create an alert
window at internal system window z-order.
- Remove all non-common windows for the system after each test run.

Bug: 35034729
Test: adb shell am instrument -w -e package com.android.server.wm
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I4726811e382b18fbef6b9d9b12a5ee56776628e4
2017-02-08 07:45:38 -08:00
Romain Guy
91a8ec0145 Don't print shader source
Bug: 32984164
Test: compile & run
Change-Id: If632e49b773ca44d4e09e3acb5979f4df15a8d77
2017-02-08 07:45:11 -08:00
TreeHugger Robot
c71d1c2880 Merge "Allow EAP-SIM authentication methods under PEAP" 2017-02-08 15:35:28 +00:00
TreeHugger Robot
f9a55d42d2 Merge "AutoSize TextView (part 8) - APIs for predefined sizes" 2017-02-08 14:57:43 +00:00
Paul Duffin
24843fdf3b Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" 2017-02-08 14:49:34 +00:00
Chris Craik
08c9ca5228 Merge "Add ShadowShaderAnimation benchmark" 2017-02-08 14:23:34 +00:00
Adam Lesinski
af463961bc Merge "AAPT: Fix --feature-of to allow non-public symbol visibility" 2017-02-08 14:07:22 +00:00
Adam Lesinski
929d6517df AssetManager2: Add GetResourceId
Add ability to lookup a resource by name.

Test: make libandroidfw_tests
Change-Id: I262ba5ce4c9892458226fbdb44cf21f9877fb92d
2017-02-08 06:04:52 -08:00
Julia Reynolds
0ebe2d1b0d Merge changes from topics 'proto', 'lights'
* changes:
  Dump notification records to proto
  Highlight selected channel on launching settings.
  Let developers choose a light color for channels
2017-02-08 13:34:28 +00:00
TreeHugger Robot
8bc078d734 Merge "Improve AnchoredWindow with smart positioning logic." 2017-02-08 13:01:57 +00:00
Andrei Stingaceanu
9fe208fe6b AutoSize TextView (part 8) - APIs for predefined sizes
* getter/setter for predefined sizes
* reads and configures from XML at construction time
* fix for an ugly bug where the sizes were missing an
  entry in certain cases, e.g: min = 10; max = 20;
  step = 2 would have produced [10, 12, 14, 16, 18]
  instead of [10, 12, 14, 16, 18, 20]
* fix using getHeight()/getWidth() instead of
  untrusted getMeasuredHeight()/getMeasuredWidth()
  and move the auto-sizing triggering to
  onLayout() instead of onMeasure() (while manually
  testing discovered missing or extra pixels and
  sometimes resizing being skipped - it's all fixed
  now)
* fix using deceiving getTotalPaddingBottom()/...Top()
  and replaced with getExtendedPaddingBottom()/..Top()
  (getTotal... was removing the whitespace height but
  auto-size needs to know about it so it can fill the
  space)

Bug: 32221168
Test: attached in the same topic
      run cts-dev -m CtsWidgetTestCases -t \
      android.widget.cts.TextViewTest

Change-Id: Id5a31d0d32b2b4082af45b4bd65af8cb85bdc92e
2017-02-08 12:48:21 +00:00