Commit Graph

75956 Commits

Author SHA1 Message Date
Torne (Richard Coles)
29675b2941 Fix NPE in WebView relro creator process.
There's no context available in the relro creator process, resulting in
a NPE and crash when it tries to see if WebView is supported. Skip the
check in this case, because we know it's supported if we ran the relro
creation process at all.

Change-Id: I95e9aad7407b8f73dddf8a8b685d41d2f500736a
Fixes: 67398770
Test: boot, make sure no crash dialog from "android"
2017-10-04 12:40:55 -04:00
TreeHugger Robot
01a89656ba Merge "[Magnifier - 2] Turn magnifier ON" 2017-10-04 13:41:13 +00:00
Clara Bayarri
29e6f56950 Merge "Fix NPE in ActivityThread" into oc-mr1-dev am: 348b13f597
am: 889c0c0f12

Change-Id: I93b731cd4a52828e1c3d00018d4c095ab0e508a3
2017-10-04 13:00:52 +00:00
Clara Bayarri
889c0c0f12 Merge "Fix NPE in ActivityThread" into oc-mr1-dev
am: 348b13f597

Change-Id: I4ac05199b93902bb19fd6eb42563e9c4fa00ed6c
2017-10-04 12:51:59 +00:00
TreeHugger Robot
348b13f597 Merge "Fix NPE in ActivityThread" into oc-mr1-dev 2017-10-04 12:40:39 +00:00
Andrei Stingaceanu
060b3d7b5c [Magnifier - 2] Turn magnifier ON
Flip the flag for turning ON the magnifier attached
to Editor's handles.

Bug: 66657373
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: manual test that shows the magnifier working
Change-Id: I644c2b834a0c630e5a84a0b948b8667ea988eea6
2017-10-04 11:27:08 +01:00
Andrei Stingaceanu
6c591dd3c3 Merge "[Magnifier - 1] Initial implementation and wiring" 2017-10-04 09:38:53 +00:00
TreeHugger Robot
498ecb9a07 Merge "Improve job scheduler docs re 'idle' and 'charging' constraints" 2017-10-04 01:33:52 +00:00
TreeHugger Robot
1daecf91e3 Merge "Added ViewNode.getWebScheme()." 2017-10-04 00:50:44 +00:00
Felipe Leme
aee3ccb15c Merge "Fixed URL used on sample." into oc-mr1-dev
am: 6ba7019bb0

Change-Id: I124cbaecd5f8763ecd7f4b06070af48f6b1e0c1d
2017-10-04 00:36:02 +00:00
TreeHugger Robot
bac998a0cb Merge "Prevent WakeLock count ending up in an incorrect state" 2017-10-03 23:04:57 +00:00
TreeHugger Robot
a4fabd3ef2 Merge "Add more fields in Suggestion model" 2017-10-03 22:20:10 +00:00
Felipe Leme
114a441554 Added ViewNode.getWebScheme().
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsAssistTestCases

Fixes: 65207762

Change-Id: Ia8f7b3f5fce8cf0cc783e861fd7e1f1f7f78db19
2017-10-03 14:54:49 -07:00
Felipe Leme
52c6ed3763 Fixed URL used on sample.
Test: nope!
Bug: 66963249

Change-Id: Ieb46c00d97c8657a4e7498a8136c6da46760fbdd
2017-10-03 14:49:15 -07:00
TreeHugger Robot
f725749478 Merge "incidentd: Adding RankingHelper data to NotificationManager proto output." 2017-10-03 21:43:50 +00:00
TreeHugger Robot
61ce9fcd16 Merge "Rename mCursorDrawble to mDrawableForCursor" 2017-10-03 21:20:47 +00:00
Yi Jin
8cf1ffec89 Merge "Implement procstats dumpsys section" 2017-10-03 20:54:13 +00:00
Henrik Baard
8d475ca058 Prevent WakeLock count ending up in an incorrect state
WakeLock can end up in a bad state if the following sequence
is executed:

1. mWakeLock =  mPowerManager.newWakeLock(...)
2. mWakeLock.acquire(TIMEOUT_MS);
3. timeout TIMEOUT_MS occurs before release() is called
4. release is called()

[1] mInternalCount = mExternalCount = 0
[2] mInternalCount = 1, mExternalCount = 1
[3] mInternalCount = 0, mExternalCount = 1
[4] mInternalCount = -1, mExternalCount = 0

If acquireLocked is called on the same object after this sequence,
mInternalCount is incremented to 0 which results in no wakelock
being requested from PowerManagerService.

Bug: 64676694
Test: cts-tradefed run commandAndExit cts-dev -m CtsOsTestCases -t android.os.cts.PowerManager_WakeLockTest
Change-Id: I133812aefb5d92eec2e2dde1a36f81dc9ffd7625
2017-10-03 14:45:34 -06:00
Fan Zhang
6abced38e5 Add more fields in Suggestion model
- Icon and suggestionType are needed to customize suggestion UI in
  Settings.

Bug: 65065268
Test: instrumentation test
Change-Id: I62ca80128d327a2c2e925ed37529c0255ca37a8a
2017-10-03 13:27:42 -07:00
Christopher Tate
7815251dc6 Improve job scheduler docs re 'idle' and 'charging' constraints
Make it clear that the job scheduler's "idle" constraint is not the
same as "doze" or "device idle," and has nothing to do with
"maintenance windows" or similar.

Also make it clear that the charging constraint is not the same
as simply being connected to some power source.

Test: m offline-sdk-docs
Change-Id: Ibcccf911740d3cfbceaf6cb27bb18318a4f735ca
2017-10-03 13:26:43 -07:00
Etan Cohen
5b8273e465 Merge "[RTT2] Add API for testing whether feature exists on platform" 2017-10-03 20:14:31 +00:00
TreeHugger Robot
dcc0ee2dd6 Merge "Stop returning run width of StaticLayout.Builder.addStyleRun." 2017-10-03 19:48:17 +00:00
Kweku Adams
62b4224757 incidentd: Adding RankingHelper data to NotificationManager proto output.
BUG: 65750824
Test: flash on device and look at incident.proto output
Change-Id: I9323cc109d96715b2114aa405eda79ae4c109c14
2017-10-03 12:35:48 -07:00
TreeHugger Robot
dffe6733b2 Merge "Improve handling of devices without a WebView." 2017-10-03 19:35:06 +00:00
Roozbeh Pournader
e06eebf480 Rename mCursorDrawble to mDrawableForCursor
To go around app bugs caused by assuming that mCursorDrawable is an
array. The apps try to manipulate mCursorDrawable by using
reflection, but crash since they access it incorrectly after it
changed from an array to a single Drawable in
I249befaf70630bef435c8db9039e8aacf233bf7c.

Bug: 66988832
Test: mmm -j frameworks/base
Change-Id: I04fc930d786dd4c74b560d7a25d17353f49ea25b
2017-10-03 12:13:46 -07:00
Seigo Nonaka
5cc9348e9e Stop returning run width of StaticLayout.Builder.addStyleRun.
The return value of addStyleRun is not used.
By no longer returning run width, the LineBreaker can defer the
style and line breaking calculation.

Bug: 65024629
Test: bit CtsTextTestCases:*
Change-Id: I2c835ff1c58657863da12976e71007c29b1bb039
2017-10-03 17:48:52 +00:00
Clara Bayarri
cb941157a2 Fix NPE in ActivityThread
Calling LoadedApk.getResources() instead of accessing its
mResources directly accounts for the case where this might
not have been initialized.

Bug: 67327250
Test: none
Change-Id: Iaa392a90eefb60ad479cedf8c882976dbe390387
2017-10-03 16:03:22 +00:00
TreeHugger Robot
48ffde7ed0 Merge "[RTT2] New (v2) Wi-Fi RTT framework" 2017-10-03 15:48:31 +00:00
Andrei Stingaceanu
d2eadfa4b1 [Magnifier - 1] Initial implementation and wiring
* implementation of a magnifier which can be attached to any view
* important APIs:
** show(float centerXOnScreen, float centerYOnScreen, float scale)
** dismiss()
* smart offset => shows below if there is no space above
* controlled by boolean flag (easy to turn off)
* attached the magnifier to Editor's handles
* vertically snaps to the middle of the line containing the
  selection
* horizontally snaps to the offset of the character where
  the selection starts/ends

Bug: 66657373
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: manual test that shows the magnifier working
Change-Id: I1d4616b8bb1210d869ac47dca137ea9636355250
2017-10-03 16:45:54 +01:00
Torne (Richard Coles)
ff937ac226 Improve handling of devices without a WebView.
Use the presence of FEATURE_WEBVIEW to determine whether a device is
intended to have a WebView implementation or not, instead of trying to
fall back to NullWebViewFactoryProvider after loading WebView fails.
This removes the need for nullwebview entirely, and eliminates a class
of possible bug where unexpected exceptions during loading cause the
fallback mechanism not to work reliably.

On devices which don't have the feature, don't start
WebViewUpdateService at all. Guard all the places which try to access
the service to return reasonable (empty/null) results when this is the
case, instead of throwing exceptions.

Change-Id: I839adaaf0abee28f4989e3fbc0c49c0732d0ec1c
Bug: 31849211
Fixes: 28529980
Test: on wear and non-wear, cts-tradefed run cts -m CtsWebkitTestCases
2017-10-03 10:40:20 -04:00
Etan Cohen
692e68e7a2 [RTT2] Add API for testing whether feature exists on platform
Add PackageManager API which allows apps to test whether the platform
officially supports the Wi-Fi RTT API.

Only start the RTT service if the device supports it.

Bug: 65014628
Test: integration tests pass
Change-Id: Ie88bd29ccd592e9a29ff24e8cc346afc360f03b0
2017-10-03 07:01:05 -07:00
Etan Cohen
17ba47254c [RTT2] New (v2) Wi-Fi RTT framework
Replace existing Wi-Fi RTT manager framework. Creating new framework
in parallel since there's code using the new framework - will be
switched over once new version ready.

New version is AIDL-based.

Bug: 65014552
Test: unit tests and integration tests
Change-Id: Id468c9b2a3c94eb30959f5ac5e4b1688fb8fc633
2017-10-03 07:01:01 -07:00
TreeHugger Robot
c92d97c450 Merge "Shortcut: Avoid long lines in dumpsys" 2017-10-03 01:38:47 +00:00
Chris Wren
5a860604e3 Merge "Enable experimentation on notification snooze options" into oc-mr1-dev am: 9cb14a0c95
am: 4706c262fa

Change-Id: Ic99064fcb8a51b8d66ce5b55e4e2da52cbc1557b
2017-10-03 00:28:16 +00:00
TreeHugger Robot
df85294d73 Merge "DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am: d30e47ecfc am: 849805b804 am: 45f17f4533"" into oc-mr1-dev-plus-aosp 2017-10-03 00:27:10 +00:00
Chris Wren
4706c262fa Merge "Enable experimentation on notification snooze options" into oc-mr1-dev
am: 9cb14a0c95

Change-Id: Ia54ca5b12479f22c9bef54b1f488bcb74e15423f
2017-10-03 00:19:02 +00:00
TreeHugger Robot
9cb14a0c95 Merge "Enable experimentation on notification snooze options" into oc-mr1-dev 2017-10-03 00:02:08 +00:00
Makoto Onuki
6208c675fd Shortcut: Avoid long lines in dumpsys
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Change-Id: Iaf758860cb492436685f177fcc9dc68cb341a462
2017-10-02 16:20:35 -07:00
Hansong Zhang
185ec6d91d DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am: d30e47ecfc am: 849805b804 am: 45f17f4533"
This reverts commit 7c55e52d51.

Merged-In: I06ffc536f5912d53319b4d325f77991d65ab04f2
Change-Id: Ib83d5de0dbc0c98c6cf0b4c5f7381cb0f70a5da5
2017-10-02 22:33:47 +00:00
Chris Wren
e901a7e0ed Enable experimentation on notification snooze options
Bug: 67003813
Test: runtest systemui

Change-Id: Id46ef3938e2edc633f64cec7b66e10d80c9a0bff
2017-10-02 17:38:16 -04:00
George Mount
085ef4ed9a Merge "Fix Transition test failure." into oc-mr1-dev am: dbd11d6c8b
am: 8e8e3eff08

Change-Id: Ifbffc328d5d356f77d668deb7104d7d73fc28bf2
2017-10-02 21:37:16 +00:00
George Mount
8e8e3eff08 Merge "Fix Transition test failure." into oc-mr1-dev
am: dbd11d6c8b

Change-Id: I5ae4bde02a4ee2a6d053529ebed0b6aa3dc596c5
2017-10-02 21:23:15 +00:00
TreeHugger Robot
db96ddcad8 Merge "Remove unused method setPos from MeasuredText." 2017-10-02 20:46:58 +00:00
TreeHugger Robot
dbd11d6c8b Merge "Fix Transition test failure." into oc-mr1-dev 2017-10-02 20:36:06 +00:00
Seigo Nonaka
70091d17e8 Remove unused method setPos from MeasuredText.
Bug: 65024629
Test: Verified with TreeHugger
Change-Id: I023532c9decbc7b798aa4cb2dedc5ca5fb8d96f0
2017-10-02 20:30:53 +00:00
TreeHugger Robot
6214ad9f5f Merge "Statsd can pull kernel wakelock data" 2017-10-02 18:22:53 +00:00
TreeHugger Robot
9748940395 Merge "Update javadoc of {set, get}OrganizationName to clearly specify that it is available for PO since N and DO since O." 2017-10-02 16:59:20 +00:00
Wen ZHANG
2be4cfcc51 Update javadoc of {set, get}OrganizationName to clearly specify that it
is available for PO since N and DO since O.

Test: Change to Javadoc only

Change-Id: Icc54fd8c9f188207f49d623795b17b835fc9b92d
2017-10-02 15:17:38 +00:00
Hugo Benichi
124b3e7738 Merge "DO NOT MERGE Ignore DUN in describeImmutableDifferences" into oc-mr1-dev
am: 9d5f50a9f8

Change-Id: I0236132b8b497af5b1c26aa44e6494fe0510cb6d
2017-10-02 11:10:37 +00:00
Hugo Benichi
9d5f50a9f8 Merge "DO NOT MERGE Ignore DUN in describeImmutableDifferences" into oc-mr1-dev 2017-10-02 10:57:01 +00:00