Commit Graph

301953 Commits

Author SHA1 Message Date
Manu Cornet
bec5fee38d 2D Recents: use a slightly darker scrim background
am: 48de4e6afe

Change-Id: I33a961dbd1741d72fa86a0cde0b2e60b76271955
2016-12-29 00:19:48 +00:00
Jiaquan He
3b430f7d0c Merge "2D recents: show all close buttons right away" into nyc-mr2-dev 2016-12-29 00:13:18 +00:00
Jiaquan He
55a684ff65 Merge "2D Recents: use a slightly darker scrim background" into nyc-mr2-dev 2016-12-29 00:12:53 +00:00
Jiaquan He
23a46518c9 Merge "Merge "Resue TaskView information." into nyc-mr2-dev am: 6335e35d51" into nyc-mr2-dev-plus-aosp
am: 31ebbf40bc

Change-Id: I340049bc897dc760cdf25a87c817c41c1f64fdc4
2016-12-29 00:08:33 +00:00
Jiaquan He
f8a40fb9f2 Merge "Resue TaskView information." into nyc-mr2-dev am: 6335e35d51
am: e0133206d3

Change-Id: I21dd96e8bdf12845c8f9308cae51af8851f280c2
2016-12-29 00:08:27 +00:00
Jiaquan He
8f34df423d Cut the Grid-based Recents title if it's too long.
Bug: 33847657
Bug: 32101881
Change-Id: I040dafcb37c9259dded8fa2cd896e4e4a59aeae5
2016-12-28 16:07:17 -08:00
Jiaquan He
26f637b555 Move grid checking into the layout algorithm.
We move grid layout checking into the layout algorithm, so that we can
hide more computation from the views.

Bug: 32101881

Change-Id: I174fe33ef7ed3c04987771dbb42d831a4b9bdab2
2016-12-28 16:07:15 -08:00
Jiaquan He
97bddd3595 Merge "Resue TaskView information. am: 0a5e2d6b93" into nyc-mr2-dev-plus-aosp
am: a1ac1af80f

Change-Id: I6d3a6a0be887b4ec7269e77c32c617079c42c345
2016-12-29 00:06:39 +00:00
Jiaquan He
59deea52e3 Resue TaskView information. am: 0a5e2d6b93
am: e6dd53291e

Change-Id: Iedf5472abf2cf11ce0b9ad1f83224adbfda144ff
2016-12-29 00:06:31 +00:00
Adrian Roos
02ca26defc Merge "QS - Fix race condition in accessibility" am: 302efd6125 am: 3c0a8bba3c am: b12ed1e10f
am: 0a4e1b7078

Change-Id: I1409cc428b41b01ffb1461f011337a7cbe409b46
2016-12-29 00:05:22 +00:00
Android Build Merger (Role)
31ebbf40bc Merge "Merge "Resue TaskView information." into nyc-mr2-dev am: 6335e35d51" into nyc-mr2-dev-plus-aosp 2016-12-29 00:00:25 +00:00
Android Build Merger (Role)
a1ac1af80f Merge "Resue TaskView information. am: 0a5e2d6b93" into nyc-mr2-dev-plus-aosp 2016-12-28 23:59:59 +00:00
Jiaquan He
e0133206d3 Merge "Resue TaskView information." into nyc-mr2-dev
am: 6335e35d51

Change-Id: I6498fbdb0c948913da95a5beccaa9feeb5f8f1ed
2016-12-28 23:58:54 +00:00
Jiaquan He
e6dd53291e Resue TaskView information.
am: 0a5e2d6b93

Change-Id: I0d998b0e31dedb48ef284386811fe67fbda6c981
2016-12-28 23:58:49 +00:00
Adrian Roos
0a4e1b7078 Merge "QS - Fix race condition in accessibility" am: 302efd6125 am: 3c0a8bba3c
am: b12ed1e10f

Change-Id: I2f17f2bd2f293f2c68ba20fbfd6aa3e693f8b865
2016-12-28 23:58:43 +00:00
Adrian Roos
b12ed1e10f Merge "QS - Fix race condition in accessibility" am: 302efd6125
am: 3c0a8bba3c

Change-Id: I3e05c8c127c021dc321b0ef130159ff7a021a9e8
2016-12-28 23:51:30 +00:00
TreeHugger Robot
6335e35d51 Merge "Resue TaskView information." into nyc-mr2-dev 2016-12-28 23:50:57 +00:00
Adrian Roos
3c0a8bba3c Merge "QS - Fix race condition in accessibility"
am: 302efd6125

Change-Id: I13c4959fde96684c52124ff8809d6921fc404a42
2016-12-28 23:43:46 +00:00
Svetoslav Ganov
0f929c5320 Don't allow permission change to runtime
Prevent apps to change permission protection level to dangerous
from any other type as this would allow a privilege escalation
where an app adds a normal permission in other app's group and
then redefines it as dangerous leading to the group auto-grant.

Test: Added a CTS test which passes.

bug:33860747

Change-Id: I1ccf546f78ee79ff027cb98124be81c8e5265a82
2016-12-28 23:38:28 +00:00
dooyoung.hwang
acf90acf13 QS - Fix race condition in accessibility
When users try to open panel, initialization of accessibility is called
in Main Thread by this callstack.

at android.view.ViewGroup.buildOrderedChildList
at android.view.View.populateAccessibilityNodeInfoDrawingOrderInParent
at android.view.View.onInitializeAccessibilityNodeInfoInternal
at android.view.View.onInitializeAccessibilityNodeInfo
at android.view.View.createAccessibilityNodeInfoInternal
at android.view.View.createAccessibilityNodeInfo
at android.view.accessibility.AccessibilityRecord.setSource
...
at android.view.View.setFlags
at android.view.View.setVisibility
at com.android.systemui.qs.QSContainer.updateQsState
at com.android.systemui.qs.QSContainer.setExpanded
at com.android.systemui.statusbar.phone.NotificationPanelView.updateQsState

And another initialization is tried in QSTileHost Thread by this callstack.

at android.view.ViewGroup.buildOrderedChildList
at android.view.View.populateAccessibilityNodeInfoDrawingOrderInParent
at android.view.View.onInitializeAccessibilityNodeInfoInternal
at android.view.ViewGroup.onInitializeAccessibilityNodeInfoInternal
at android.view.View.onInitializeAccessibilityNodeInfo
at android.view.View.createAccessibilityNodeInfoInternal
at android.view.View.createAccessibilityNodeInfo
at android.view.accessibility.AccessibilityRecord.setSource
...
at android.view.View.announceForAccessibility
at com.android.systemui.qs.QSPanel.onAnnouncementRequested
at com.android.systemui.qs.QSTile.handleStateChanged

This race condition can cause crashes, because the same ArrayList
(mPreSortedChildren or mTempArrayList in ViewGroup) is modified by two
different thread.

Test : manual

Change-Id: I9e0ad1fef4be7dc378463c06d10854e0e4c5b3d6
Fixes: 33947140
(cherry picked from commit 1b0066230e)
2016-12-28 15:34:23 -08:00
Adrian Roos
302efd6125 Merge "QS - Fix race condition in accessibility" 2016-12-28 23:29:59 +00:00
Ashutosh Joshi
0396cde363 Merge "Change the name of the contexthub service." 2016-12-28 21:59:38 +00:00
Ashutosh Joshi
835da289fa Change the name of the contexthub service.
Change the name used by the contexthub service. Specifically, this
change switches from using the "ContexthubService.CONTEXTHUB_SERVICE"
constant to using the "Context.CONTEXTHUB_SERVICE" constant- which is in
line with the other Android services.

Merged-In: I18ae73ed0fda2f938e3233670dc52b5692d321ae
Test: GTS tests pass.

Change-Id: I18ae73ed0fda2f938e3233670dc52b5692d321ae
2016-12-28 13:57:27 -08:00
Ashutosh Joshi
c3550fddff Change the name of the contexthub service.
Change the name used by the contexthub service. Specifically, this
change switches from using the "ContexthubService.CONTEXTHUB_SERVICE"
constant to using the "Context.CONTEXTHUB_SERVICE" constant- which is in
line with the other Android services.

Test: GTS tests pass.
Change-Id: I18ae73ed0fda2f938e3233670dc52b5692d321ae
2016-12-28 13:52:44 -08:00
Andrew Solovay
07d6896028 Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am: 61dad4b2fc am: 897df2b5af am: 602c3c7073
am: eb609a3d0f

Change-Id: Iddd98eec069c710ca4e86cf4ef98817d81edda0e
2016-12-28 20:52:11 +00:00
Andrew Solovay
31d1f1c1db [DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am: 40ba793b33 am: 2891357f4d am: 23473e8851
am: 3a623dcd7d

Change-Id: I13d01d6962a6f77877ea882f6630dcfb10c58b56
2016-12-28 20:51:06 +00:00
Andrew Solovay
345f60dec6 Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am: 61dad4b2fc am: 897df2b5af am: 563ca19747
am: 75a9407af6

Change-Id: I5f632d147c7b83cf5f375da572e269ce13626ce4
2016-12-28 20:46:15 +00:00
Andrew Solovay
eb609a3d0f Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am: 61dad4b2fc am: 897df2b5af
am: 602c3c7073

Change-Id: I496cfe09a488f9bfc278e10e72423da3e2406c6f
2016-12-28 20:45:39 +00:00
Andrew Solovay
305040411b [DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am: 40ba793b33 am: 2891357f4d am: ff501e5e5f
am: 88addedb34

Change-Id: Ic38830c87084c6fc7237f290f8167324744c12d0
2016-12-28 20:44:54 +00:00
Andrew Solovay
3a623dcd7d [DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am: 40ba793b33 am: 2891357f4d
am: 23473e8851

Change-Id: Id8590431f317068e0f851f0b77862b825734eae6
2016-12-28 20:44:32 +00:00
Andrii Kulian
77b165f0af Merge changes I2ac2cdba,I6ade7874
* changes:
  Fix crash when removing a display with activities
  Add positionChildAt method to WindowContainer
2016-12-28 20:41:34 +00:00
Andrew Solovay
75a9407af6 Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am: 61dad4b2fc am: 897df2b5af
am: 563ca19747

Change-Id: I133647a253f62208c7ee6deb6cf15a955f09ec8e
2016-12-28 20:38:40 +00:00
Andrew Solovay
88addedb34 [DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am: 40ba793b33 am: 2891357f4d
am: ff501e5e5f

Change-Id: I8e7bf9b66c92ed5db45007084075fca36ccaa0c8
2016-12-28 20:37:36 +00:00
Andrew Solovay
602c3c7073 Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am: 61dad4b2fc
am: 897df2b5af

Change-Id: I06cea8a7d84e02346047e0e0bf88cf30f9da4120
2016-12-28 20:32:13 +00:00
Andrew Solovay
563ca19747 Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am: 61dad4b2fc
am: 897df2b5af

Change-Id: I32b241e93caac5e38c54610b799c877365be75ff
2016-12-28 20:32:03 +00:00
Jeremy Joslin
72f5e08ce2 New permission - BIND_NETWORK_RECOMMENDATION_SERVICE.
Used to protect exported network recommendation services.

Test: Built & ran
BUG:33897544
Change-Id: I4f163fb965be6a25201bc3ba5e0032e7652c8f20
2016-12-28 12:31:30 -08:00
Andrew Solovay
23473e8851 [DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am: 40ba793b33
am: 2891357f4d

Change-Id: Id95f2f8c11a98b56f656b3688accd632fe6da43d
2016-12-28 20:31:08 +00:00
Andrew Solovay
ff501e5e5f [DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am: 40ba793b33
am: 2891357f4d

Change-Id: I9b15c8787d6f6aa6c2d362de46ab06a583d3283c
2016-12-28 20:31:02 +00:00
Jeremy Joslin
6e8f439eb9 Merge "Cleanup the evaluateBinding() method." am: c26aa87a2b am: b12af1b18a am: 3ba918c9d3
am: 7a93f7e661  -s ours

Change-Id: Id9f9eb8407047e4613540da349753a1a6595dca9
2016-12-28 20:24:42 +00:00
Andrew Solovay
897df2b5af Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev
am: 61dad4b2fc

Change-Id: I1918b70ad644f7aded33d27bcc55e05478d9f773
2016-12-28 20:24:34 +00:00
Andrew Solovay
2891357f4d [DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported.
am: 40ba793b33

Change-Id: I5d15df8192fee8362dca8dcc53d84b75af29a13f
2016-12-28 20:24:30 +00:00
Jeremy Joslin
7a93f7e661 Merge "Cleanup the evaluateBinding() method." am: c26aa87a2b am: b12af1b18a
am: 3ba918c9d3

Change-Id: I72485ebbaed2b60b48d1b4694b0db56b9f2178ca
2016-12-28 20:17:35 +00:00
Andrew Solovay
61dad4b2fc Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev 2016-12-28 20:16:30 +00:00
Shahriyar Amini
1fc3aee9a2 Make methods for Tile content provider data public.
Bug: 31002801
Test: make RunSettingsLibRoboTests

The public methods can be used to retrieve Tile data from a content
provider dynamically in other Settings components.

Change-Id: I2ce1f5620b09dcdb46f315c8ddf04e9f07084e91
2016-12-28 12:15:45 -08:00
Jeremy Joslin
3ba918c9d3 Merge "Cleanup the evaluateBinding() method." am: c26aa87a2b
am: b12af1b18a

Change-Id: I65d005aa303102b212c93b0b2702941bf554526d
2016-12-28 20:10:35 +00:00
Jeremy Joslin
b12af1b18a Merge "Cleanup the evaluateBinding() method."
am: c26aa87a2b

Change-Id: Iaac51cf5114ed6af55246b3580b9f5403a1bb3bd
2016-12-28 20:03:05 +00:00
Treehugger Robot
c26aa87a2b Merge "Cleanup the evaluateBinding() method." 2016-12-28 19:52:42 +00:00
TreeHugger Robot
280cdfcbc0 Merge "AAPT2: Treat non-AAPT attributes as Attributes with no format specified." 2016-12-28 19:29:22 +00:00
Jiaquan He
9c6eebe848 Merge "Check split screen properly." into nyc-mr2-dev am: 632332c259
am: bec9df8060

Change-Id: Ieed1829265dbdd6c079a3f8d18ead3784790a275
2016-12-28 19:28:10 +00:00
Jiaquan He
1060c9dcfd Check split screen properly. am: 5fac212e8b
am: e3ecb097b0

Change-Id: Ic534ab1ef2c6c0067e1d43f31b662ea23e221e8d
2016-12-28 19:26:59 +00:00