196441 Commits

Author SHA1 Message Date
Christopher Tate
2438c9b2e7 Merge "Fix dispatch of onRestoreFinished()" into mnc-dev 2015-07-01 01:25:54 +00:00
Svetoslav
0010b70bea Grant permissions to headless system calendar/contacts sync adapters.
bug:21861781

Change-Id: I5f9905a23ba1b23e387adf2cea842172d34207b0
2015-06-30 18:22:20 -07:00
Aravind Akella
b02e6050bd Fix for last sensor missing from sensor list returned by the HAL.
Bug: 22072216
Change-Id: I39a422fb80adcd348ff9c10bf3d3f19ab569a0af
2015-06-30 18:02:45 -07:00
Christopher Tate
758de809b9 Fix dispatch of onRestoreFinished()
The agent instance wasn't properly being conveyed from the generic
restore engine implementation to the state machine handling the
lifecycles.  On top of that, the lifecycle wasn't advancing to the
restore-finished callback phase properly in the full-data restore
case.

Bug 22194736

Change-Id: Ic649d6a196adbd21a4a0f3083c7eed2fff383e52
2015-06-30 17:58:27 -07:00
Chris Craik
df72b63928 Switch from fminf/fmaxf to std::min/max
bug:22208220

Shows considerable improvement in performance, especially in tight
loops.

Change-Id: I4bcf6584a3c145bfc55e73c9c73dcf6199290b3c
2015-06-30 17:58:21 -07:00
Svet Ganov
67a461eca8 Merge "Rename uses-permission-m to uses-permission-23" into mnc-dev 2015-07-01 00:55:58 +00:00
Yohei Yukawa
63c4a7185c Merge "Reland "Fixed constant window switching on lock screen..."" into mnc-dev 2015-07-01 00:51:36 +00:00
Jeff Sharkey
fc2740ae57 Merge "Hand out storage to more system apps." into mnc-dev 2015-07-01 00:42:44 +00:00
Dianne Hackborn
80abf887a1 Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 2015-07-01 00:41:46 +00:00
Adam Lesinski
14b5701029 Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev 2015-07-01 00:40:25 +00:00
Jeff Sharkey
7186dd3a30 Hand out storage to more system apps.
Grant storage access to the Storage Access Framework provider that
offers to delegate access to storage devices.  Also grant to the
default music app.

Bug: 22104872
Change-Id: I8cf7dceec8b4c1e31f8ddd40b094ccd4ecb1caf8
2015-06-30 17:32:48 -07:00
Jeff Sharkey
ca2f2feda8 Merge "Fully unmount existing storage in Zygote." into mnc-dev 2015-06-30 23:59:50 +00:00
Dianne Hackborn
593334ab70 Fix issue #22124996: VI: Command Request not Active
Just forgot to add the request to the active set.

Also eradicate a bunch of old cruft that has been replaced
by the final APIs, and improve voice interaction test to
sit fully on top of the final APIs and have a test for
command request.

Change-Id: Ieff7a6165ebf2a4c5fb80c1ebd020511a2ae63ee
2015-06-30 16:59:41 -07:00
Jorim Jaggi
e4b840d63d Fix overexpand panel motion
Expanding was already set to false when we decided which QS
overscroll animation to run. We can't change the order of expanding
finished/tracking finished because of another bug. Instead, let the
stack scroller know about tracking state and combine both of them.

Bug: 21705230
Change-Id: I041ff1fabc6c939c233528f9d08d804ead64bbab
2015-06-30 23:33:00 +00:00
Jorim Jaggi
e4f1a202d8 Fix Keyguard header animation from SHADE_LOCKED -> Keyguard
Bug: 22128249
Change-Id: I36dbecc41e66922987c1b753d62bde27cb3b17be
2015-06-30 23:25:33 +00:00
Yohei Yukawa
d1a092218b Reland "Fixed constant window switching on lock screen..."
This is a manual reland of I3680256d41793f62def42fda00e26db1dcc9,
which was certainly merged into lmp-mr1-dev then auto-merged into
master but silently lost there for unknown reasons when
I8c42a1e6091b0fe1253e90265ac248087e was auto-merged into master.

Changes in WindowAnimator.java was already covered by
I2933eaf0ab55fe31cb382c46c411033e33a756e0 so this CL does not
include that change.

Bug: 18021493
Bug: 22158649
Change-Id: Ib1bf9f5bef44d0400230afc32231f7d1f3a1c98b
2015-06-30 16:22:05 -07:00
ztenghui
c2756505b2 Merge "Update the doc for VectorDrawable's Tint support" into mnc-dev 2015-06-30 23:20:31 +00:00
Adam Lesinski
49a2a6985d Merge "Add helper function to extract app ID from shared app gid." into mnc-dev 2015-06-30 23:16:20 +00:00
Svet Ganov
ffd25bbed1 Rename uses-permission-m to uses-permission-23
bug:20072113

Change-Id: Ia872853274c604a6fee1c1d84f82a98334523bac
2015-06-30 23:06:41 +00:00
Amith Yamasani
2b64ec470c Merge "Don't allow non-admins to adopt sd card for internal storage" into mnc-dev 2015-06-30 23:00:08 +00:00
ztenghui
810c1c868e Update the doc for VectorDrawable's Tint support
b/21726146

Change-Id: I262f77b980afa81407b008276190062974cdc4fa
2015-06-30 15:59:21 -07:00
Jeff Sharkey
faf3f69217 Fully unmount existing storage in Zygote.
Before mounting the requested storage into place, fully unmount all
existing mounts inherited from the root namespace.

Bug: 22192518
Change-Id: I6f7f12c1219d25ee487a031d37c60fb4051d24ad
2015-06-30 15:56:33 -07:00
Chet Haase
081ddbe296 Merge "Invalidate parent when scrolling child view back onto screen" into mnc-dev 2015-06-30 22:46:44 +00:00
Alan Viverette
5906f58771 Merge "Use non-greedy view to draw background in landscape time picker" into mnc-dev 2015-06-30 22:45:07 +00:00
Vinit Deshpande
7226c8f95b More API review feedback
ScanResult now hides all flags and their values, only methods
are public; and converted roaming consortium to an array of longs
instead of Longs.

Bug: 22179306

Change-Id: I644110dbddd5fa7a7109ac16051845fcc4c4e9d1
2015-06-30 15:44:00 -07:00
Deepanshu Gupta
c428b55c97 Merge "Replace infinite loop with foreach." into mnc-dev 2015-06-30 22:42:00 +00:00
Deepanshu Gupta
f5ca45baab Merge "Add missing resolveResValue call." into mnc-dev 2015-06-30 22:41:44 +00:00
Deepanshu Gupta
c77f9c76e4 Replace infinite loop with foreach.
A method call exists to find all inner classes. Use it instead of
manually enumerating the possibilities and checking.

Also fix a typo.

Change-Id: I2af678e92ea0c11b53617b247d8cda324391c185
2015-06-30 15:36:34 -07:00
Chet Haase
1b7f8f99c3 Invalidate parent when scrolling child view back onto screen
This bug caused views which used to be quick-rejected to continue to not
be drawn because the parent's DisplayList no longer contained them. The
fix is to notice when offsetting a view puts it back on screen and invalidates
the parent appropriately.

Issue #21413554  offsetTopAndBottom requires invalidating parent when view becomes visible again

Change-Id: I0f5d2cc48e3da912a41635712d9c37fb30e70c86
2015-06-30 15:33:30 -07:00
Rich Slogar
48413e6a11 am 761b4a7d: Merge "docs: migration guide link update" into mnc-preview-docs
* commit '761b4a7deb2438e039fdb11a05e2de41593ffd8f':
  docs: migration guide link update
2015-06-30 22:31:52 +00:00
Jorim Jaggi
6ef5898793 Don't show orb when voice session is already running
Bug: 22195186
Change-Id: I7839536d2f6362889a924b65011d80556f0176b8
2015-06-30 22:30:34 +00:00
Jorim Jaggi
3b866bee86 Make sure endClosing doesn't get called too early
Bug: 22196478
Bug: 22184101
Change-Id: I3488c40b74a080efbba9b1544f9709f7e509988b
2015-06-30 22:30:08 +00:00
Alan Viverette
aa69922ace Use non-greedy view to draw background in landscape time picker
Bug: 21933765
Change-Id: I95d608e9be166308e3a9b013a2c4c17cd4345046
2015-06-30 15:29:13 -07:00
Rich Slogar
761b4a7deb Merge "docs: migration guide link update" into mnc-preview-docs 2015-06-30 22:21:18 +00:00
Filip Gruszczynski
3ce79f6c0c am 96496e2d: Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev
* commit '96496e2d17607a8bfa944461c2458b0dcdeee872':
  Build fix after changing IWindowSession.
2015-06-30 22:17:55 +00:00
Filip Gruszczynski
2987f616fa resolved conflicts for merge of 300ccf4a to mnc-dev
Change-Id: Ia315e314bfde0c066a2c25d93f8cbdc71fee0a14
2015-06-30 15:03:30 -07:00
Filip Gruszczynski
96496e2d17 Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev 2015-06-30 22:02:34 +00:00
Luan Nguyen
a4ac253bc3 am ed053477: Merge "docs: Move scale Bitmap code to onSurfaceChanged" into mnc-preview-docs
* commit 'ed053477d0f76edad4853f0a5aac275acfe2d6ce':
  docs: Move scale Bitmap code to onSurfaceChanged
2015-06-30 22:02:23 +00:00
Adam Lesinski
f4216d30cd Add helper function to extract app ID from shared app gid.
Bug:22008744
Change-Id: Ifadc7df3777dd74932833f4d22a0e285d7bdaf95
2015-06-30 15:00:22 -07:00
Amit Mahajan
45e50f87bb am 71699d76: am 95c47354: am 43d3bd02: am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '71699d760eff662055dde458ea0d614a32fb6dfc':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-30 21:55:08 +00:00
Joe Fernandez
f1f720b607 am cbbbabaa: am 4c8ecd9a: am 72356f0b: am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
* commit 'cbbbabaa4aa1cbb84cb49133ecda1da2f06daf54':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
2015-06-30 21:55:01 +00:00
Luan Nguyen
ed053477d0 Merge "docs: Move scale Bitmap code to onSurfaceChanged" into mnc-preview-docs 2015-06-30 21:53:29 +00:00
Svet Ganov
1aaad610df Merge "Do not hold a lock when calling API to grant default permissions" into mnc-dev 2015-06-30 21:44:34 +00:00
Doris Liu
e08f3b3ff5 Merge "Resolve CompoundButton's foreground drawable for layout direction change" into mnc-dev 2015-06-30 21:42:43 +00:00
Filip Gruszczynski
7e3b61e73d Build fix after changing IWindowSession.
Change-Id: I339fecb0138e8b8907fc53372b694021f6327260
2015-06-30 14:42:21 -07:00
Amit Mahajan
71699d760e am 95c47354: am 43d3bd02: am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '95c47354a6841d7ae3a81fcacea5acdd25dc42c6':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-30 21:40:32 +00:00
Joe Fernandez
cbbbabaa4a am 4c8ecd9a: am 72356f0b: am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
* commit '4c8ecd9a70b3ba1bbf0b546c6189a892e63a6f18':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
2015-06-30 21:40:27 +00:00
Doris Liu
99aa13ec10 Merge "Allow null child view when checking whether divider should draw" into mnc-dev 2015-06-30 21:35:09 +00:00
Deepanshu Gupta
5d1eaf4a19 Add missing resolveResValue call.
Bug: http://b.android.com/178504
Change-Id: I7dde8094cf762893e4f7ea0d3de87a281c9602cd
2015-06-30 14:28:58 -07:00
Amit Mahajan
95c47354a6 am 43d3bd02: am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '43d3bd027604f400caf49826e5b4705784937b35':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-30 21:23:41 +00:00