Commit Graph

246497 Commits

Author SHA1 Message Date
Steve Elliott
b8eb2c5608 Merge "decouple HCE from FEATURE_NFC" into nyc-mr1-dev 2016-05-10 19:49:00 +00:00
TreeHugger Robot
4b8ab89eca Merge "Don't even try adjusting when dock is minimized" into nyc-dev 2016-05-10 19:47:41 +00:00
Dimitry Ivanov
434f539224 Merge "Simplify permitted-path construction" into nyc-dev
am: 6e2b3d158a

* commit '6e2b3d158a333b8754854314af0fc865a1f8bc5e':
  Simplify permitted-path construction

Change-Id: I70ac68b50cd43cd5d725d9bb5df48b92f5edd624
2016-05-10 19:25:28 +00:00
Keisuke Kuroyanagi
78f0d83550 Sum up character widths to get the last line width for ellipsis.
To properly apply ellipsis, we virtually concatenate the last line and
overflowed lines after line breaking for a paragraph.
Previously, width of the concatenated line was computed by summing up all
line's width.  However, the width is wrong when there are any trailing
white  spaces that can be normal white spaces by concatenating lines.
With this CL, we sum up widths of all characters in lines except the last
overflowed line.

Bug: 28599066
Change-Id: I41d828ee8eb8a702cd5096d626b307cbb3467047
2016-05-10 12:21:33 -07:00
Amith Yamasani
4f128e4d96 Fix multi-window assiststructure trashing
When multiple activities within the same process
try to handle requests for AssistStructure, the
singleton mLastAssistStructure tends to trash
the old structure when a second window's request
comes in.

This change passes in a sessionId so that the
cache is only cleared if the session id changes.

Bug: 28348867
Change-Id: I07efcd933db7e48aefd25a1c95493b71bbcffe4b
2016-05-10 12:17:51 -07:00
TreeHugger Robot
6e2b3d158a Merge "Simplify permitted-path construction" into nyc-dev 2016-05-10 19:17:03 +00:00
Ricky Wai
8481258303 Hide notification before tie managed profile lock
We should hide the notification asap before setting
managed profile lock, to reduce the time that user is unlocked
while the notification is still showing.

Bug: 28689675
Change-Id: I289302302e3079726998adefebe2e8b113b2e52a
2016-05-10 20:11:59 +01:00
Svetoslav Ganov
eed1ea9541 Merge "Don\'t throw runtime exceptions for permission flags" into nyc-dev
am: 01da140ace

* commit '01da140aced14162d6d1bf4a0b2bf33e23b9c2c4':
  Don't throw runtime exceptions for permission flags

Change-Id: I5add764e1665c24e54bc3d461ef0ad8ca6c880a0
2016-05-10 18:56:11 +00:00
Svetoslav Ganov
01da140ace Merge "Don't throw runtime exceptions for permission flags" into nyc-dev 2016-05-10 18:52:17 +00:00
Cheryl Potter
ee9d8c1944 docs: Add redirects for deleted files on AS devsite b/28679461 am: bc753be9e3 am: 90f143e1f3 am: 9f2b8642a8
am: 0158baf9fb

* commit '0158baf9fb7017b40c804528f622ab86c35a2b9c':
  docs: Add redirects for deleted files on AS devsite b/28679461

Change-Id: Ia9c9047764fc3460cc1997897ef84adff81cf1b1
2016-05-10 18:40:23 +00:00
Cheryl Potter
0158baf9fb docs: Add redirects for deleted files on AS devsite b/28679461 am: bc753be9e3 am: 90f143e1f3
am: 9f2b8642a8

* commit '9f2b8642a8d496cceb0e0ab3ed0f67ae7f357ae0':
  docs: Add redirects for deleted files on AS devsite b/28679461

Change-Id: I3a1ae7b5c76cb6395ea2bfbfe8cea223fecf653a
2016-05-10 18:37:18 +00:00
Cheryl Potter
9f2b8642a8 docs: Add redirects for deleted files on AS devsite b/28679461 am: bc753be9e3
am: 90f143e1f3

* commit '90f143e1f384ae37878e46997e43b171384c421d':
  docs: Add redirects for deleted files on AS devsite b/28679461

Change-Id: I9e5c8225010dbfa631c6f51fad094def57e4db15
2016-05-10 18:34:39 +00:00
Cheryl Potter
90f143e1f3 docs: Add redirects for deleted files on AS devsite b/28679461
am: bc753be9e3

* commit 'bc753be9e3838cedfb2b45ef2076cc71f2cbe9b5':
  docs: Add redirects for deleted files on AS devsite b/28679461

Change-Id: I196bb7059c78439d051a5e3e9daac0033e4c6595
2016-05-10 18:32:01 +00:00
Jorim Jaggi
1ae68bfd59 Don't even try adjusting when dock is minimized
Bug: 28652219
Change-Id: I61fa515ec945e1da6b9e7a53766abea2fb1e606e
2016-05-10 18:25:45 +00:00
Fyodor Kupolov
6c915ead38 Push unlocking/unlocked state to UserManager
Push unlocking/unlocked state to UserManagerInternal when it's changed in
UserController. Use UserManagerInternal.isUserUnlockingOrUnlocked when
updating flags for filtering in PackageManager.

Bug: 28629076
Change-Id: I8440af090f533f93870d0cff0e3871e114c37efa
2016-05-10 11:09:02 -07:00
Narayan Kamath
abefb9d365 Merge "Use MetricsLogger.histogram for optimizing app statistics." into nyc-dev
am: 6795f0ba19

* commit '6795f0ba198170c5cc044e04be65dd1171d5f7a5':
  Use MetricsLogger.histogram for optimizing app statistics.

Change-Id: I5e25f823c11d5f5f85b27c5d7b42f054514acd9e
2016-05-10 18:07:46 +00:00
Cheryl Potter
bc753be9e3 docs: Add redirects for deleted files on AS devsite
b/28679461

Change-Id: I825cf17a4065b1af67fa1792cf66e50c30208e17
2016-05-10 11:06:25 -07:00
Chong Zhang
4289fa1a72 Merge "Make sure preserved surface is removed when it\'s no longer needed" into nyc-dev
am: 0a872f0b12

* commit '0a872f0b126e233a194dce9359032667f7d34694':
  Make sure preserved surface is removed when it's no longer needed

Change-Id: I7a7542416cc86a78c4867c48eae69d63c2c435da
2016-05-10 17:58:26 +00:00
Wale Ogunwale
138939f571 Merge "Fixed logic error when calculating window touch exclude region." into nyc-dev
am: 8eb290150c

* commit '8eb290150c1e1d1c432643555342815f554bd32c':
  Fixed logic error when calculating window touch exclude region.

Change-Id: I2ca63c49eb7c26b0b5219e6c35cb0693fd9d7be3
2016-05-10 17:58:24 +00:00
Narayan Kamath
6795f0ba19 Merge "Use MetricsLogger.histogram for optimizing app statistics." into nyc-dev 2016-05-10 17:56:22 +00:00
Chong Zhang
0a872f0b12 Merge "Make sure preserved surface is removed when it's no longer needed" into nyc-dev 2016-05-10 17:53:27 +00:00
TreeHugger Robot
8eb290150c Merge "Fixed logic error when calculating window touch exclude region." into nyc-dev 2016-05-10 17:52:29 +00:00
Dimitry Ivanov
eb96b00382 Simplify permitted-path construction
The white list of permitted directories is applied for every
classloader namespace by libnativeloader. LoadedApk no longer
needs to do that.

Add mDataDir to permitted paths in the case if for any reason
it is outside of the whitelisted dirs.

Bug: http://b/28639227
Change-Id: I5b61ac64e281ecee3e3e9b1fe56cf04dc6ee7b25
2016-05-10 10:51:40 -07:00
Yigit Boyar
9afbf9ceb7 Fully detach unused scrap views
This CL fixes a bug in list view where an unused
scrap view would stay in temporarily detached
state until it is re-used.
It is an invalid state for a view and to fix
that issue, I've changed AbsListView to fully
detached scrap views at the end of a layout
pass and also treat them as regular new views once
they are re-used after being fully detached.

Bug: 28672259
Change-Id: I6e3f4da29f8cbca32787862402f5c21f674a7145
2016-05-10 10:49:39 -07:00
Adrian Roos
bf32a1dcaa Merge "Keep RemoteInputView visible when focused" into nyc-dev
am: 046f2c80ae

* commit '046f2c80ae4763cedeeeaf51d4d2d7155cb3d3d4':
  Keep RemoteInputView visible when focused

Change-Id: I2c0fefa9cb4e761a833fe554532aefd0875de4ad
2016-05-10 17:47:10 +00:00
Adam Lesinski
8ac51d14b6 Resource shared libraries: fix theme references
Theme values that would reference other theme values would not work
if they were declared in a shared library.

We now introduce a parallel resource type to TYPE_DYNAMIC_REFERENCE,
TYPE_DYNAMIC_ATTRIBUTE, which allows us to lookup and resolve
theme value references from shared libraries.

Bug:28687378
Change-Id: I4f2364e3e8b567679f90784fcaaea12b6b05e926
2016-05-10 10:45:52 -07:00
TreeHugger Robot
046f2c80ae Merge "Keep RemoteInputView visible when focused" into nyc-dev 2016-05-10 17:41:59 +00:00
smain@google.com
77f368fed9 new downloads and notes for studio 2.1.1 security update
Change-Id: Iabe51586dfc1355011a75f6d193e4ee32e480e95
2016-05-10 17:24:03 +00:00
Jason Monk
7002b410de Make collapsed QS work the same as expanded
Change-Id: I59d8de76a5f06a7896fd8b70a661e5c329620c2e
Fixes: 28414350
2016-05-10 12:57:59 -04:00
Delphine Martin
ce528bba46 Merge "Set jack.assert.policy value to \'always\'" into nyc-dev
am: 1100edb83f

* commit '1100edb83fd8099609ffed9ea1290f95d15f7ca0':
  Set jack.assert.policy value to 'always'

Change-Id: Ic8f3b6ae889a4e10a20d11ba6345a49920d9f364
2016-05-10 16:32:36 +00:00
Benoit Lamarche
1100edb83f Merge "Set jack.assert.policy value to 'always'" into nyc-dev 2016-05-10 16:28:29 +00:00
Paul Jensen
9132f34976 ApfFilter unit test
Bug: 26238573

Change-Id: I5171038228782bd54e91f5bcc663cc529d2c1150
2016-05-10 11:54:42 -04:00
Svet Ganov
a8f9026d22 Persist settings on a dedicated background thread
Settings were persisted on the system background thread but during
first boot the device is under heavy load and persisting settings
competes with other system components using the shared background
thread. As a result persisting settings can be delayed much longer
than the expected 200ms. This can cause issues with setup wizard
being skipped/went over and its component disaabled being persisted
but the setting whether the device is provisioned not being
persisted - now if the device boots it will have no SUW but also
the home button would be missing. Generally, we need a tansactional
abstraction in the system process to peform all delayed operations
atomically.

bug:25472484

Change-Id: I8e0cf7ffa32e86e36e777964eb0c3cc7de02d3c3
2016-05-10 08:48:00 -07:00
Wale Ogunwale
e4dd964531 Fixed logic error when calculating window touch exclude region.
Problem was introduced in ag/960365. We need to properly set the
temp variable to the current task bounds before trying to use it.

Bug: 26962445
Change-Id: I3cded03582e1379e16fa48f69da6ceadb92d8d4b
2016-05-10 08:39:01 -07:00
Svetoslav Ganov
7e01af4243 Don't throw runtime exceptions for permission flags
We were thrwing undocumented runtime exception when
one gets the permission flags - now we just return
default result of the package is gone.

bug:28657926

Change-Id: I42554a86b9304ff83fe9385f3eea930b8ebf0c63
2016-05-10 15:34:36 +00:00
Paul Jensen
dd7bee8772 Use APF program to drop non-IP non-ARP broadcasts
This used to be done by some WiFi firmwares but should now be done by APF
for consistency across the board.

Bug: 28304368
Change-Id: Ic75f408affc1f56e1ecf4d347d0c287aa72250bf
2016-05-10 11:33:30 -04:00
Jason Monk
3857c06ebc Merge "Fix accessibility order in nav bar" into nyc-dev
am: 4691e24d0b

* commit '4691e24d0b0f0cd0c9728d9e937513ebbe98a1f3':
  Fix accessibility order in nav bar

Change-Id: Id81fcdc1344e3583f53a21c10c3d9681bae34367
2016-05-10 15:32:12 +00:00
Jason Monk
4691e24d0b Merge "Fix accessibility order in nav bar" into nyc-dev 2016-05-10 15:26:36 +00:00
Jason Monk
c62cf80faa Fix accessibility order in nav bar
Change-Id: I2e90dee8e50b0642f39258fe3d04ded2f0bb8961
Fixes: 28281859
2016-05-10 11:19:48 -04:00
Amanda Kassay
7cf1e9c403 Deleting pages so redirects work on DevSite. b/28670825
Change-Id: I4eb039d96f3f1378ecf0960d31ffea1bfbca0520
2016-05-10 11:10:44 -04:00
Ruben Brunk
9a344fe8f9 Merge "Set notification listener defaults for system VrListeners." into nyc-dev
am: aaabcce6d4

* commit 'aaabcce6d4373cbbc8b08b0ceb26cf0b8259437d':
  Set notification listener defaults for system VrListeners.

Change-Id: Ia29a5e02b2fd22727cc6079d9641a6c078565074
2016-05-10 15:03:36 +00:00
Narayan Kamath
a01f04a4ec Merge "Patrially revert 4ec026930bfbbb5d8923f359c8." into nyc-dev
am: 9bfc33f8ae

* commit '9bfc33f8aeea4d958fa2315cd8b6e6234464c8ab':
  Patrially revert 4ec026930b.

Change-Id: Ieb05a88326f0e6f11a74f1d82e11391a5af9c962
2016-05-10 15:03:33 +00:00
Ruben Brunk
aaabcce6d4 Merge "Set notification listener defaults for system VrListeners." into nyc-dev 2016-05-10 14:54:46 +00:00
Narayan Kamath
966210b721 Use MetricsLogger.histogram for optimizing app statistics.
bug: 28528058
bug: 28544474
Change-Id: Icbe26e9699eade08725e38914f07d7584e77b608
2016-05-10 15:53:29 +01:00
TreeHugger Robot
9bfc33f8ae Merge "Patrially revert 4ec026930bfbbb5d8923f359c8." into nyc-dev 2016-05-10 14:45:36 +00:00
Delphine Martin
2a6b5c63c0 Set jack.assert.policy value to 'always'
The policy value 'enable' does not exist anymore
and was replaced by 'always'

Change-Id: I233a555821a84d917e3b3ec923b5baffc18bd2d2
2016-05-10 14:42:33 +00:00
Diego Perez
5ca21e4cec Fix VectorDrawable_Delegate and DrawerLayout
Modify the nDraw call that has been changed in the framework to return
an int with the number of pixels allocated.
Modify the animation initialization render call to use the actual
measured size (instead of 0,0) so the DrawerLayout is setup
correctly.

Change-Id: I198de05206382c6489056f7c3d9a1d328864321c
2016-05-10 15:21:38 +01:00
Joachim Sauer
91f4aec3cc Fix AbstractStringBuilder gaining extra APIs.
AbstractStringBuilder showed up in the API as gaining methods originally
belonging to StringBuffer/StringBuilder (mostly append(*) and
insert(*)).

Ideally it should not be in the API at all, but it's traditionally been
there and we'll keep it for now.

@hide the affected methods and move the "implements Appendable"
definition to StringBuffer/StringBuilder (as methods implementing an
interface can't be @hidden).

Bug: 27582395
Change-Id: I0b85c2c84f3e52ffe7864728d083f9c6ea7304ef
2016-05-10 15:15:17 +01:00
Bill Yi
740c0dc127 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: fc41735835  -s ours

* commit 'fc41735835f047feb8836fb26dbaebb81c3357a9':
  Import translations. DO NOT MERGE

Change-Id: Iee72c104b9f74554e9c3132f70f22916e3ef9f6c
2016-05-10 14:01:48 +00:00
Baligh Uddin
62917df2dd Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-10 13:45:29 +00:00