OSDN Git Service
Deepanshu Gupta [Sat, 23 May 2015 01:19:23 +0000 (01:19 +0000)]
Revert "Fix build."
This reverts commit
97b3ae1a8766616675ebf2323a97d8adfd41bfdc.
Reverted since
4bb6b751fbbb218e8a298db4aa008472a0aa8d31 reverts
the commit that warranted this change.
Change-Id: I56d0eb8ffba44a673ae357e9543dd18f6c03c54f
Filip Gruszczynski [Thu, 21 May 2015 02:40:27 +0000 (19:40 -0700)]
Fix build.
Cherry picking because automerger is stuck.
Change-Id: I49f669ee8eed53cf2fc30077cf0a066312865733
(cherry picked from commit
c1b736a0cdf41ab5863bfe6901e46c95cc396342)
Jim Miller [Fri, 22 May 2015 01:42:23 +0000 (01:42 +0000)]
Merge "Fix crash in fingerprint and problem where directory has wrong selinux label" into mnc-dev
Dianne Hackborn [Fri, 22 May 2015 01:12:43 +0000 (01:12 +0000)]
Merge "Add API to track usage time of apps." into mnc-dev
Selim Gurun [Fri, 22 May 2015 01:02:12 +0000 (01:02 +0000)]
Merge "Clean remaining API related issues." into mnc-dev
Selim Gurun [Fri, 22 May 2015 00:24:08 +0000 (17:24 -0700)]
Clean remaining API related issues.
Bug:
21063767
Change-Id: Ifb6936699367b4cc1641b74c890856c0b51978d2
Jim Miller [Fri, 22 May 2015 00:02:21 +0000 (17:02 -0700)]
Fix crash in fingerprint and problem where directory has wrong selinux label
Fixes bug
21373942
Change-Id: I860656b0c9e26c038d03d9872c490466dc62d4e7
Adrian Roos [Fri, 22 May 2015 00:09:11 +0000 (00:09 +0000)]
Merge "Prevent ImmersiveModeCling from eating all touches" into mnc-dev
Filip Gruszczynski [Fri, 22 May 2015 00:02:47 +0000 (00:02 +0000)]
Merge "resolved conflicts for merge of
47249f2a to mnc-dev" into mnc-dev
Deepanshu Gupta [Fri, 22 May 2015 00:01:45 +0000 (00:01 +0000)]
Merge "Add LayoutLibDelegate for new Bitmap method." into mnc-dev
Dianne Hackborn [Thu, 21 May 2015 01:18:46 +0000 (18:18 -0700)]
Add API to track usage time of apps.
This adds a new ActivityOption for the caller to ask the
system to track the time the user is in the app it launches,
delivering the result when they are done.
The time interval tracked is from when the app launches the
activity until the user leaves that app's flow. They are
considered to stay in the flow as long as new activities
are being launched or returned to from the original flow,
even if they cross package or task boundaries. For example,
if the originator starts an activity to view an image, and
while there the user selects to share, which launches gmail
in a new task, and they complete the share, the time during
that entire operation will be included.
The user is considered to complete the operation once they
switch to another activity that is not part of the tracked
flow. For example, use the notification shade, launcher, or
recents to launch or switch to another app. Simply going
in to these navigation elements does not break the flow
(although the launcher and recents stops time tracking of
the session), it is the act of going somewhere else that
completes the tracking.
The data is delivered to the app through a PendingIntent,
which includes the total time the app was in the flow along
with a time break-down by app package.
Change-Id: If1cf8892d422c52ec5042eba0e15a8e7e8f83abf
Craig Mautner [Thu, 21 May 2015 23:40:26 +0000 (23:40 +0000)]
Merge "For getHomeActivity() only return current user." into mnc-dev
Selim Cinek [Thu, 21 May 2015 23:14:45 +0000 (16:14 -0700)]
The heads up now have a margin on top and don't stick to the edge
Bug:
21337754
Change-Id: I199bc0732df62eadc2458db12a7c1059da988020
Selim Cinek [Thu, 21 May 2015 19:11:12 +0000 (12:11 -0700)]
Fixed a crash with HUN notifications
Bug:
20925733
Change-Id: Id96c9e476d9faa770b5bcd3c35213dd0debdeaea
Deepanshu Gupta [Thu, 21 May 2015 23:03:24 +0000 (16:03 -0700)]
Add LayoutLibDelegate for new Bitmap method.
Original method added in:
721ae5fec5f1fd4f93aa2a361a0ac298e15ce353
Change-Id: Ie14d132459638cf103c390fae3f4c0c02bef2f34
Craig Mautner [Thu, 21 May 2015 22:33:30 +0000 (15:33 -0700)]
For getHomeActivity() only return current user.
Previously getHomeActivity() returned the topmost home activity
independent of which user was currently running. That defeated the
purpose of the method. This fix returns the home activity of the
current user or null if one has not yet been created.
Also remove some cruft that accumulated.
Fixes bug
21055376.
Change-Id: Ic1d58129aedbe3624f8a9d12c05c84674687b0a4
Nancy Chen [Thu, 21 May 2015 22:01:33 +0000 (22:01 +0000)]
Merge "Fix phone account component name for voicemail status entries." into mnc-dev
Yohei Yukawa [Thu, 21 May 2015 21:47:33 +0000 (21:47 +0000)]
Merge "Do not clear IMM#mCurRootView in IMM#finishInputLocked()." into mnc-dev
Yohei Yukawa [Thu, 21 May 2015 07:15:05 +0000 (00:15 -0700)]
Do not clear IMM#mCurRootView in IMM#finishInputLocked().
This is a follow up CL for I219394178e4172bc47864297f1418e677dba.
As explained in the commit message of I219394178e4172bc47864297f,
IMM#mCurRootView needs to be synchronized with the actual window
focus more precisely to fix Bug
20820914. Hence we should not
clear IMM#mCurRootView in IMM#finishInputLocked() anymore.
Ideally this CL should have been included in the previous CL.
Manually tested following scenarios.
- Repro steps in Bug
6413553. Made sure that IMM#mCurRootView
is cleared after switching back from the current application to
the previous application with back key.
- Test application that calls WebView#showFindDialog(). Made sure
that LatinIME works fine when switching text fields. This is
non-trivial because android.webkit.FindActionModeCallback is
changed in the previous CL I219394178e4172bc47864297f1418e677db.
- Repro steps in Bug
21144633. Made sure that we can enter
recipient's name in the messaging app.
This CL depends on I219394178e4172bc47864297f1418e677dba25e5.
Bug:
20820914
Change-Id: Id6afc8fc64512225578c62557b96c7dc2e969adf
Jorim Jaggi [Thu, 21 May 2015 00:20:40 +0000 (17:20 -0700)]
Always tell Keyguard about occluded state
If there was a window with FLAG_DISMISS_KEYGUARD first, when the
device was unlocked, mWinDismissingKeyguard was set to that window.
Now, a window with FLAG_SHOW_WHEN_LOCKED came on top, so we set the
Keyguard as occluded, but we didn't reset the window that is
dismissing Keyguard.
After that, the old window with FLAG_DISMISS_KEYGUARD was the focused
window again. However, since we didn't reset mWinDismissingKeyguard,
we ended up with DISMISS_KEYGUARD_CONTINUE, and lockscreen was not
occluded anymore. However, we never really told Keyguard about it
because DISMISS_KEYGUARD_CONTINUE was set instead of
DISMISS_KEYGUARD_START.
The first fix of this bug is to always tell Keyguard about the
current occluded state. The second fix is to reset
mWinDismissingKeyguard in case a window SHOW_WHEN_LOCKED comes on top.
Bug:
20102975
Change-Id: I7c778df09a1e393b9eeaf51fd2013012cb40fea9
Jorim Jaggi [Thu, 21 May 2015 01:42:16 +0000 (18:42 -0700)]
Keep status bar visible when animating in negative heights
So we don't accidentally invoke bouncer and introduce jank
when expanding again.
Bug:
18502113
Change-Id: I0206cf1f48779d0d0fc661cb27852e2d202245ba
Adrian Roos [Thu, 21 May 2015 20:27:58 +0000 (13:27 -0700)]
Prevent ImmersiveModeCling from eating all touches
Bug:
21330248
Bug:
19282730
Change-Id: I3982aa9582341032a41670fdf82e0321b84178d2
Steve McKay [Thu, 21 May 2015 20:27:36 +0000 (20:27 +0000)]
Merge "[mnc-dev] Hide list/grid menu items for copy dest action...in mnc-dev!" into mnc-dev
Christopher Tate [Thu, 21 May 2015 20:27:11 +0000 (20:27 +0000)]
Merge "Close race condition in binderDied()" into mnc-dev
Steve McKay [Wed, 20 May 2015 21:07:22 +0000 (14:07 -0700)]
[mnc-dev] Hide list/grid menu items for copy dest action...in mnc-dev!
BUG=
21259006
Change-Id: Ic31dfa1a1cffa4340769c08db3e3cb3fb46e31d5
(cherry picked from commit
e04e02d027b731448d68995a202c8867c4985fa3)
Nancy Chen [Tue, 19 May 2015 03:12:21 +0000 (20:12 -0700)]
Fix phone account component name for voicemail status entries.
Currently was using toString(), switch to "flattenToString" so it is
consistent with the call log.
Bug:
20954214
Change-Id: Ia9ed67bf463e4a2d4d9a02e00243d49238be17fe
Leon Scroggins III [Thu, 21 May 2015 19:05:45 +0000 (19:05 +0000)]
Merge "Fix overflow in NinePatchImpl." into mnc-dev
Deepanshu Gupta [Thu, 21 May 2015 18:59:30 +0000 (18:59 +0000)]
Merge "Add documentation about hack in commit:
f8ea750455" into mnc-dev
Selim Cinek [Thu, 21 May 2015 05:13:55 +0000 (22:13 -0700)]
Fixed a bug where a notification could get below the empty shade view
This lead to a temporary flash when a notification came in with
the empty shade view being visible.
Bug:
20972545
Change-Id: I2b06f63dd43bf53bb2d1da0cddb635a709663f71
Deepanshu Gupta [Thu, 21 May 2015 18:47:36 +0000 (11:47 -0700)]
Add documentation about hack in commit:
f8ea750455
Change-Id: I9ce871a67fb67e02e0c4df1eb5c3261ea52a914b
Selim Cinek [Thu, 21 May 2015 05:48:40 +0000 (22:48 -0700)]
Protecting against the correct flag for the input consumer
Also allow hiding the navbar if immersive or immersivesticky.
Bug:
21089476
Change-Id: I540e668746056a0e4bb077898792afd225e4e19e
Craig Mautner [Thu, 21 May 2015 18:34:31 +0000 (18:34 +0000)]
Merge "Add debug for bug
21055376." into mnc-dev
Eino-Ville Talvala [Thu, 21 May 2015 18:15:29 +0000 (18:15 +0000)]
Merge "Camera2: Fix spelling mistake" into mnc-dev
Craig Mautner [Thu, 21 May 2015 18:12:51 +0000 (11:12 -0700)]
Add debug for bug
21055376.
Change-Id: I1e93fb225f2639af031cdfa748a7898f31ad5a94
Eino-Ville Talvala [Thu, 21 May 2015 18:10:51 +0000 (11:10 -0700)]
Camera2: Fix spelling mistake
Change-Id: I8c764d4c2ada34b126cb0097e8eefb710a08e310
Eino-Ville Talvala [Thu, 21 May 2015 18:09:37 +0000 (18:09 +0000)]
Merge "Camera2: Fix CaptureRequest @see links" into mnc-dev
Santos Cordon [Thu, 21 May 2015 17:32:36 +0000 (17:32 +0000)]
Merge "Add intents for enabling phone accounts." into mnc-dev
Chad Brubaker [Thu, 21 May 2015 17:26:43 +0000 (17:26 +0000)]
Merge "Cleanup Keystore API" into mnc-dev
Clara Bayarri [Thu, 21 May 2015 17:24:12 +0000 (17:24 +0000)]
Merge "Update the documentation for ActionMode.Callback2#onGetContentRect" into mnc-dev
Narayan Kamath [Thu, 21 May 2015 17:23:15 +0000 (17:23 +0000)]
Merge "Fix application moves." into mnc-dev
Clara Bayarri [Thu, 21 May 2015 16:45:19 +0000 (17:45 +0100)]
Update the documentation for ActionMode.Callback2#onGetContentRect
Received feedback from a team that it was not clear what the rect
had to include.
Change-Id: I03ca54ee1092e8af3a2078c42104e1ce88490cd1
Jean-Michel Trivi [Thu, 21 May 2015 16:24:00 +0000 (16:24 +0000)]
Merge "Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags" into mnc-dev
Paul McLean [Thu, 21 May 2015 16:21:47 +0000 (16:21 +0000)]
Merge "Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice()." into mnc-dev
Leon Scroggins III [Thu, 21 May 2015 13:48:15 +0000 (09:48 -0400)]
Fix overflow in NinePatchImpl.
Cast numXDivs to a size_t before adding 1, so that if numXDivs is 255
it does not overflow. Move the calculation outside of alloca().
BUG:
20727488
Change-Id: I2ecc9d650338acba7316554cb72195e02816b1f8
Paul McLean [Thu, 21 May 2015 15:51:18 +0000 (08:51 -0700)]
Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice().
Change-Id: Ibf77bb0757720aa25eaaf6e603ab446257430453
Jean-Michel Trivi [Thu, 21 May 2015 16:16:10 +0000 (16:16 +0000)]
Merge "Fix reading attributes for playback restrictions" into mnc-dev
Xiyuan Xia [Thu, 21 May 2015 16:15:50 +0000 (16:15 +0000)]
Merge "Do not show soft keyboard when locked out on keyguard UI" into mnc-dev
Eric Laurent [Thu, 21 May 2015 16:13:02 +0000 (16:13 +0000)]
Merge "AudioService: indicate system ready to AudioFlinger" into mnc-dev
Geoff Mendal [Thu, 21 May 2015 13:28:23 +0000 (13:28 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 21 May 2015 13:22:40 +0000 (13:22 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Narayan Kamath [Thu, 21 May 2015 09:50:35 +0000 (10:50 +0100)]
Fix application moves.
We don't dex2oat during application moves, so we must scan
the package again scanPackageDirtyLI to deduce its ABI.
This is unnecessary (since a move cannot change ABIs), but we
need some additional refactoring to avoid a second scan.
bug:
21337469
Change-Id: I3e9dfd5db1c928847f9d527dc15d29a05ff40e7d
Baligh Uddin [Thu, 21 May 2015 13:20:17 +0000 (13:20 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Baligh Uddin [Thu, 21 May 2015 13:20:20 +0000 (13:20 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Baligh Uddin [Thu, 21 May 2015 13:20:14 +0000 (13:20 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Baligh Uddin [Thu, 21 May 2015 13:20:11 +0000 (13:20 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 21 May 2015 13:17:30 +0000 (06:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I243054bfdbe5bae12a1b3eb9f26d7bb158681ae0
Auto-generated-cl: translation import
Geoff Mendal [Thu, 21 May 2015 13:16:22 +0000 (13:16 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 21 May 2015 13:13:24 +0000 (06:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I68ce431c2c547d2192d007d8ac5af599dd5cf1ff
Auto-generated-cl: translation import
Geoff Mendal [Thu, 21 May 2015 13:10:03 +0000 (06:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibc636bc980ceaead21d2eaf2dd813de284341ab0
Auto-generated-cl: translation import
Erik Kline [Thu, 21 May 2015 07:15:02 +0000 (16:15 +0900)]
LinkProperties function to compare provisioning and remove DNS servers
Adds:
- enum ProvisioningChange
- LinkProperties#compareProvisioning()
return a ProvisioningChange value describing the delta in
provisioning between two LinkProperties objects
- LinkProperties#removeDnsServer()
- make "@hide public" isIPv4Provisioned() and isIPv6Provisioned()
Bug:
18581716
Change-Id: I3df90b2b89617f693346f2dbe72e77c88ce91ffd
Jae Seo [Thu, 21 May 2015 05:27:06 +0000 (05:27 +0000)]
Merge "TIF: Build the list of available TV inputs as the current user" into mnc-dev
Baligh Uddin [Thu, 21 May 2015 04:59:08 +0000 (21:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie0f7cbb03d74e7c84ed90084d69a3d663f41214b
Auto-generated-cl: translation import
Baligh Uddin [Thu, 21 May 2015 04:54:23 +0000 (21:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2e800db526beb320e54c5f80ba8f8bf6a81391e0
Auto-generated-cl: translation import
Jae Seo [Thu, 21 May 2015 04:51:16 +0000 (21:51 -0700)]
TIF: Build the list of available TV inputs as the current user
Bug:
21313985
Change-Id: I8aa881570915d14d63e4ac0b8034044f8736443b
Baligh Uddin [Thu, 21 May 2015 04:51:28 +0000 (21:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I92f614dd62de9ce0ad34cfaf7f24663dc9522eb4
Auto-generated-cl: translation import
Baligh Uddin [Thu, 21 May 2015 04:49:20 +0000 (21:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib2ff568b531a2273366145275de4b2ab936703e4
Auto-generated-cl: translation import
Chet Haase [Thu, 21 May 2015 04:47:40 +0000 (04:47 +0000)]
Merge "Fix docs to not refer to non-public classes." into mnc-dev
Keisuke Kuroyanagi [Thu, 21 May 2015 04:07:55 +0000 (04:07 +0000)]
Merge "Fix: Crash when modifying text while using drag accelerator." into mnc-dev
John Spurlock [Thu, 21 May 2015 03:35:11 +0000 (03:35 +0000)]
Merge "Volume: Include a11y bit in dialog dump." into mnc-dev
John Spurlock [Thu, 21 May 2015 03:33:43 +0000 (23:33 -0400)]
Volume: Include a11y bit in dialog dump.
Bug:
21340132
Change-Id: Ie9a347e7e0f08c7019b4a483a3a87a8cba6f37da
Filip Gruszczynski [Thu, 21 May 2015 03:11:39 +0000 (20:11 -0700)]
resolved conflicts for merge of
47249f2a to mnc-dev
This is a merge of chin support.
Change-Id: I436b751b3c4aaa6b46cfcdb475e02eedfa5a5635
Jean-Michel Trivi [Thu, 21 May 2015 02:14:45 +0000 (19:14 -0700)]
Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags
Add EXTRA_RINGTONE_AUDIO_ATTRIBUTES_FLAGS to allow specifying
AudioAttributes flags that will be used when playing the
Ringtone.
Bug
19407114
Change-Id: I56a77d7308b21afc0766356e1b6a2d76dca21221
Deepanshu Gupta [Thu, 21 May 2015 01:50:22 +0000 (01:50 +0000)]
Merge "Fix overrides for BridgeResources." into mnc-dev
Deepanshu Gupta [Thu, 21 May 2015 01:25:58 +0000 (18:25 -0700)]
Fix overrides for BridgeResources.
New method overloads have been introduces in android.content.Resources.
Change BridgeResources to overrides the appropriate ones. Also, fix the
implementation to the new behaviour.
Change-Id: I7b83b329f04286512f223c0fafc3f989f1b9a244
Deepanshu Gupta [Thu, 21 May 2015 01:47:13 +0000 (01:47 +0000)]
Merge "Make DatePicker rendering not fail." into mnc-dev
Xiyuan Xia [Tue, 19 May 2015 22:00:41 +0000 (15:00 -0700)]
Do not show soft keyboard when locked out on keyguard UI
- Split password entry enabled and input enabled into two states;
- Disable input during lock check;
- Disable password entry when locked out;
- Don't show soft keyboard if password entry is disabled on resume;
- Auto show soft keyboard when password entry becomes enabled;
Bug:
20542149
Change-Id: Iffe3f205776143ac21e25e337d5b7a0e6994ebf2
Christopher Tate [Wed, 20 May 2015 21:49:38 +0000 (14:49 -0700)]
Scan at boot time to detect newly-present full backup candidates
OTA or similar might have caused an app to appear without the usual
notifications being sent. Make sure we pick up those apps as
appropriate for full-data backup.
Bug
19462310
Change-Id: Ic17bc72b14cc7599ae8ea540548fda932606b8f2
Chet Haase [Thu, 21 May 2015 00:42:27 +0000 (17:42 -0700)]
Fix docs to not refer to non-public classes.
Issue #
21328285 public Midi docs refer to internal utility class
Change-Id: Idddd5c98a78159190c6c34b17350f4630c33d6d5
Adrian Roos [Thu, 21 May 2015 01:12:58 +0000 (01:12 +0000)]
Merge "Fix ObservableScrollView's cancel dispatch" into mnc-dev
Adrian Roos [Thu, 21 May 2015 01:08:58 +0000 (18:08 -0700)]
Fix ObservableScrollView's cancel dispatch
Bug:
21239185
Change-Id: I8005556a2a6fcd8981e615a6f5537a1d7e9ce6a7
Deepanshu Gupta [Thu, 21 May 2015 01:01:48 +0000 (18:01 -0700)]
Make DatePicker rendering not fail.
Ensures that having a DatePicker in the layout doesn't crash the
complete rendering. The rendering is still not perfect, but at least it
works.
- Return a non-null window token so that ViewPager thinks that it's
attached to a window and doesn't skip populating the views.
- Fix a style not found issue.
Change-Id: Ied2b71de5b32bcb640bf4ec445e8a39509f800e9
Jim Miller [Thu, 21 May 2015 00:57:26 +0000 (00:57 +0000)]
Merge "Move from native FingerprintService implementation to fingerprintd" into mnc-dev
Eric Laurent [Wed, 20 May 2015 21:49:08 +0000 (14:49 -0700)]
AudioService: indicate system ready to AudioFlinger
Indicate when JAVA services are ready to AudioFlinger so that
calls to power manager and scheduling service can be enabled.
Bug:
11520969.
Change-Id: Id977cab3208c34709011703d2dfdcf552e60371b
Svetoslav [Thu, 21 May 2015 00:35:12 +0000 (00:35 +0000)]
Merge "Do not call out of the settings provider with a lock held" into mnc-dev
Svetoslav [Thu, 21 May 2015 00:01:10 +0000 (17:01 -0700)]
Do not call out of the settings provider with a lock held
bug:
20443441
Change-Id: I704520b75f5deaeeb1b4098cda0783c667e8cdd1
Amith Yamasani [Thu, 21 May 2015 00:10:12 +0000 (00:10 +0000)]
Merge "Use screen-on time and wallclock time for idleness calc" into mnc-dev
Deepanshu Gupta [Thu, 21 May 2015 00:03:05 +0000 (00:03 +0000)]
Merge "Use non deprecated method for creating ColorStateList" into mnc-dev
Craig Mautner [Thu, 21 May 2015 00:01:58 +0000 (00:01 +0000)]
Merge "Avoid resuming activity before launch." into mnc-dev
Santos Cordon [Wed, 20 May 2015 23:55:59 +0000 (16:55 -0700)]
Add intents for enabling phone accounts.
Bug:
20303449
Change-Id: If0057d42373b6964193c562ae8a8487a0299da76
Deepanshu Gupta [Wed, 20 May 2015 23:49:42 +0000 (16:49 -0700)]
Use non deprecated method for creating ColorStateList
Change-Id: I9fce928276c8a2af55eb0615a4895abb6a973be5
Deepanshu Gupta [Wed, 20 May 2015 23:47:06 +0000 (16:47 -0700)]
Fix line breaking.
Essentially moves line breaking measurement later in the process when
character widths have already been computed.
Change-Id: I17c5bc10d373d8906c5caf86604ce8504650cd7f
Deepanshu Gupta [Wed, 20 May 2015 23:32:03 +0000 (23:32 +0000)]
Merge "Inject anonymous inner classes of injected classes" into mnc-dev
Deepanshu Gupta [Wed, 20 May 2015 21:51:37 +0000 (14:51 -0700)]
Inject anonymous inner classes of injected classes
When injecting classes in LayoutLib (eg. CreateInfo), so that LayoutLib
can refer back to the changes, also inject the anonymous inner classes.
Without this, the injected classes are not loadable. Although, LayoutLib
itself doesn't load these classes, but some tests do.
Change-Id: Ib5f6b779ef4d79dec8d614d3dbb26eeac88a1064
Deepanshu Gupta [Wed, 20 May 2015 23:30:10 +0000 (23:30 +0000)]
Merge "Update platformDir search in tests." into mnc-dev
Andy Hung [Wed, 20 May 2015 23:01:37 +0000 (23:01 +0000)]
Merge "Fix AudioTrack, AudioRecord, AudioFormat API" into mnc-dev
Andy Hung [Tue, 19 May 2015 22:44:31 +0000 (15:44 -0700)]
Fix AudioTrack, AudioRecord, AudioFormat API
Rename getNativeFrameCount to getBufferSizeInFrames
Remove throw declaration on IllegalArgumentException and
IllegalStateException
Bug:
20887665
Bug:
21304902
Change-Id: Ia85d8010be46524b9a8b93105b16b7b9480f6bd9
Filip Gruszczynski [Wed, 20 May 2015 22:54:14 +0000 (22:54 +0000)]
am
cb89ac84: Merge "Support for devices with a chin." into cw-d-mr1-dev
* commit '
cb89ac84c621e047d81873428325dfd747b90a6b':
Support for devices with a chin.
Filip Gruszczynski [Wed, 20 May 2015 22:41:42 +0000 (22:41 +0000)]
Merge "Support for devices with a chin." into cw-d-mr1-dev
Amith Yamasani [Tue, 19 May 2015 23:51:30 +0000 (16:51 -0700)]
Use screen-on time and wallclock time for idleness calc
12 hours of screen-on time and 2 days of wallclock time
must elapse before considering an app idle.
Bug:
20066058
Change-Id: Ie7b584b40e644d868aa2708876723c3391fd432e
Craig Mautner [Wed, 20 May 2015 21:59:57 +0000 (14:59 -0700)]
Avoid resuming activity before launch.
The locktask logic would always bring a locked task to the front and
then resume it when locking. When a task is to be locked at launch that
would cause it to resume immediately before onLaunch was called. Which
would cause havoc because the token was not yet in
ActivityThread.mActivities. This lead to premature finish() calls and
looping restarts.
This change causes the resume to only be called when an app calls
startLockTask. Otherwise the resume call is skipped.
Plus additional locktask debug logging.
Fixes bug
21031298.
Change-Id: I756b0d607827d0ec7a123377db04d9377c41776d