OSDN Git Service
David Friedman [Fri, 14 Aug 2015 22:49:39 +0000 (22:49 +0000)]
Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug:
22947123" into mnc-dev
David Friedman [Wed, 12 Aug 2015 17:24:14 +0000 (10:24 -0700)]
Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page
Bug:
22947123
Change-Id: I49b72e160c40ea269a98a80356d61de49c306d96
Dianne Hackborn [Fri, 14 Aug 2015 22:17:50 +0000 (22:17 +0000)]
Merge "Add debugging for issue #
23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev
Andrew Solovay [Fri, 14 Aug 2015 21:44:37 +0000 (21:44 +0000)]
Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18" into mnc-dev
Dianne Hackborn [Fri, 14 Aug 2015 20:29:47 +0000 (13:29 -0700)]
Add debugging for issue #
23190084: [APPComm][Dev Test] {Unable to share photo...
...from Camera360 to Hangouts }
In the short URI toString, include a small summary of the ClipData (instead
of just saying it has a clip data). This makes it a lot easier to understand
what is happening when you look at the log of activity starts.
Also separate out the activity manager dump of URI permission grants from
its dump of providers, so it is easy to just look at that state.
Change-Id: I68093d9f279944e1aa9a29347075f237f4f55ed3
Adam Lesinski [Fri, 14 Aug 2015 20:46:49 +0000 (20:46 +0000)]
Merge "AAPT: Fix regression in resource versioning" into mnc-dev
Quddus Chong [Fri, 14 Aug 2015 20:44:54 +0000 (20:44 +0000)]
Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev
Andrew Solovay [Wed, 22 Jul 2015 21:43:49 +0000 (14:43 -0700)]
cherrypick from mnc-preview-docs docs: Preview 3 permissions docs.
Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18
Added section describing the new support library methods. Also
updating lists of normal and dangerous permissions based on current
AndroidManifest in mnc-dev, as well as any other changes brought to my
attention.
See first comment for doc stage location.
Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18
Adam Lesinski [Fri, 14 Aug 2015 20:16:18 +0000 (13:16 -0700)]
AAPT: Fix regression in resource versioning
With a set of resources with the following configurations:
()
(land)
the regression caused any resources that needed to be versioned in configuration () to be lost.
Bug:
23038206
Change-Id: I2f1b0313fb780ac241e7aaa487cb37dfb79c36aa
Daniel Sandler [Fri, 14 Aug 2015 19:59:48 +0000 (19:59 +0000)]
Merge "Introducing M Land." into mnc-dev
Daniel Sandler [Fri, 14 Aug 2015 19:59:35 +0000 (19:59 +0000)]
Merge ""I tried to think of the most harmless thing."" into mnc-dev
Dan Sandler [Thu, 13 Aug 2015 17:30:55 +0000 (13:30 -0400)]
Introducing M Land.
The "M" is for Multiplayer.
Bug:
21984798
Change-Id: Id752b8efe54ff0ac38854a129188027137d64dd5
Adam Lesinski [Fri, 14 Aug 2015 19:38:34 +0000 (19:38 +0000)]
Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev
Dan Sandler [Mon, 3 Aug 2015 21:42:54 +0000 (17:42 -0400)]
"I tried to think of the most harmless thing."
Bug:
21984798
Change-Id: I33ffabb72c831ff814363601a82ac9a388cb1e99
Julia Reynolds [Fri, 14 Aug 2015 19:17:31 +0000 (19:17 +0000)]
Merge "Clear calling identity before getting the current user." into mnc-dev
Jean-Michel Trivi [Fri, 14 Aug 2015 18:19:17 +0000 (18:19 +0000)]
Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev
Quddus Chong [Tue, 11 Aug 2015 22:44:45 +0000 (15:44 -0700)]
docs: Updated API Overview and Behavior Changes docs for M Preview 3.
Change-Id: Ibff73ca9321ba1b117c361402d8045d9558c5c2f
Chris Tate [Fri, 14 Aug 2015 17:11:30 +0000 (17:11 +0000)]
Merge "Make "Ask every time" actually work that way" into mnc-dev
Dianne Hackborn [Fri, 14 Aug 2015 17:06:20 +0000 (17:06 +0000)]
Merge "Fix issue #
22940169: "pm grant" can no longer grant permissions..." into mnc-dev
Svetoslav Ganov [Fri, 14 Aug 2015 15:06:16 +0000 (15:06 +0000)]
Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
Adam Lesinski [Fri, 14 Aug 2015 05:06:31 +0000 (22:06 -0700)]
Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
System UIDs are also run as shared GIDs, so this should not throw
an exception.
Bug:
23189342
Change-Id: Ia180db012c25615cde1720ae0d41d1378f7bfb1a
Christopher Tate [Thu, 13 Aug 2015 23:29:33 +0000 (16:29 -0700)]
Make "Ask every time" actually work that way
..in link-opening behavior. If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.
Bug
23147746
Change-Id: I904d8697a992b3f16f32b1c1b49c2bf9424c7137
Dianne Hackborn [Fri, 14 Aug 2015 01:25:20 +0000 (18:25 -0700)]
Fix issue #
22940169: "pm grant" can no longer grant permissions...
...with protection flag PROTECTION_FLAG_DEVELOPMENT
Bring back the old grant/revoke code for development permissions.
Also some more dumpsys output to help debugging.
And new dumpsys command for checking a permission.
Change-Id: I6e27e62a9ca5ec1ecc0f102714a448ea02f0f41c
Jeff Sharkey [Fri, 14 Aug 2015 01:18:18 +0000 (01:18 +0000)]
Merge "Method to show DialogFragment allowing state loss." into mnc-dev
Joe Fernandez [Fri, 14 Aug 2015 01:10:56 +0000 (01:10 +0000)]
Merge "Doc change: Update preview pages for dp3." into mnc-dev
Sungmin Choi [Sat, 8 Aug 2015 01:12:19 +0000 (18:12 -0700)]
Fix to check the incoming userid argument for RingtonePlayer
In PowerNotificationWarnings, where it dispatches notifications
with UserHandle.ALL:
mNoMan.notifyAsUser(TAG_NOTIFICATION, R.id.notification_power, n, UserHandle.ALL);
The fix is to have RingtonePlayer check the incoming userId argument to playAsync(),
and change USER_ALL to USER_OWNER.
BUG=
22516181
BUG=
22992637
Change-Id: Ia3f8aaa2bee7fb15c24542e2331b2bc5a877e715
Jeff Sharkey [Thu, 13 Aug 2015 23:57:29 +0000 (16:57 -0700)]
Method to show DialogFragment allowing state loss.
Same as show(), but allowing state loss.
Bug:
22867250
Change-Id: Ib779d8a3febc70ad47a9c1a9099d858707bad733
Jorim Jaggi [Thu, 13 Aug 2015 23:51:11 +0000 (23:51 +0000)]
Merge "Update time when turning on screen, in addition to waking up" into mnc-dev
Jorim Jaggi [Thu, 13 Aug 2015 22:53:14 +0000 (15:53 -0700)]
Update time when turning on screen, in addition to waking up
When in ambient display mode, we didn't get a callback to
onStartedWakingUp, thus the time was never refreshed. Since
broadcasts are disabled in this low-power state, we need to refresh
the clock manually before turning on the screen, because we can't
rely on the broadcasts to be delivered.
Bug:
23171638
Change-Id: I249f4195a14995f7c1467e73ac2aa400b871f80e
Joe Fernandez [Thu, 13 Aug 2015 18:49:40 +0000 (18:49 +0000)]
Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev
Joe Fernandez [Thu, 13 Aug 2015 18:45:23 +0000 (11:45 -0700)]
docs: Update uses-sdk-element page with API 23 (M) listing
Change-Id: If579411c66f3cfc02b270a04b266fe7562b48e14
Joe Fernandez [Thu, 13 Aug 2015 18:27:11 +0000 (18:27 +0000)]
Merge "docs: Update developer docs make file to include API 23" into mnc-dev
Dirk Dougherty [Thu, 13 Aug 2015 16:55:30 +0000 (09:55 -0700)]
Doc change: Update preview pages for dp3.
Change-Id: If4a3beab28cc2114cf01a2d6202dc072768960fc
Mike Dodd [Thu, 13 Aug 2015 15:16:39 +0000 (15:16 +0000)]
Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
Jason Monk [Thu, 13 Aug 2015 14:38:46 +0000 (14:38 +0000)]
Merge "Add more intelligence to bluetooth connection state" into mnc-dev
Julia Reynolds [Thu, 13 Aug 2015 13:01:33 +0000 (09:01 -0400)]
Clear calling identity before getting the current user.
This is necessary so non-privilged apps can call setInterruptionFilter.
Bug:
23156657
Change-Id: Ia903a39626c93957276d66805446cd25a91341b5
Bart Sears [Thu, 13 Aug 2015 05:32:14 +0000 (05:32 +0000)]
Merge "Fix Keyguard drawn timeout" into mnc-dev
Svet Ganov [Tue, 11 Aug 2015 15:59:12 +0000 (08:59 -0700)]
Add GTS test to ensure valid default permission grants - framework
The platform grants runtime permissions by default to apps on the
system image that provide core device use cases which a user expects
to work out-of-the-box. We are now adding a test to ensure that
OEMs cannot pregrant premissions on non approved components.
bug:
23043018
Change-Id: Id76717cce0ee59678956bd0be347d3c045fe4c51
Joe Fernandez [Thu, 13 Aug 2015 02:45:22 +0000 (19:45 -0700)]
docs: Update developer docs make file to include API 23
Change-Id: I1bb9c37cafdfc7c78c23099a0fde2914f3068485
Dianne Hackborn [Thu, 13 Aug 2015 00:46:59 +0000 (00:46 +0000)]
Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
Jeff Sharkey [Wed, 12 Aug 2015 23:51:55 +0000 (23:51 +0000)]
Merge "Update ifaces when global restriction changes." into mnc-dev
Jeff Sharkey [Wed, 12 Aug 2015 23:46:05 +0000 (16:46 -0700)]
Update ifaces when global restriction changes.
Global restriction of background data only applies to metered
interfaces, but battery saver applies to all interfaces. In the
very specific case where global background had been turned on while
battery saver was enabled, we'd end up with a stale battery saver
rule floating around.
This change triggers an update of iface rules when the global
restriction changes, giving us consistent behavior.
Bug:
23098198
Change-Id: I454dc71cf11d50a2e9e6122e8a801ff17039b43a
Dianne Hackborn [Wed, 12 Aug 2015 23:10:58 +0000 (16:10 -0700)]
Fix issue #
23116383: Include security patch level in Settings
Change-Id: I4934c7d26bf69b5c599962cd74ac1e4ea4ad4b51
Mike Dodd [Tue, 11 Aug 2015 20:14:53 +0000 (13:14 -0700)]
Set default SMS/MMS app to com.android.messaging (new AOSP app).
b/
23110861
Change-Id: Ifcdcfdea4d19875bf32ec19d245abc5e5a582b4c
Raph Levien [Wed, 12 Aug 2015 21:00:07 +0000 (21:00 +0000)]
Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
Jason Monk [Wed, 12 Aug 2015 20:17:34 +0000 (16:17 -0400)]
Add more intelligence to bluetooth connection state
Since bluetooth connection state has a mind of its own... If we
think we are connected, but we don't actually know about any devices
that are currently connected, we probably aren't. So set the state
that way, and let everyone know.
Bug:
22977827
Change-Id: I9266f5394b179a3917b3818839f7c6b2dc238376
Clara Bayarri [Wed, 12 Aug 2015 18:46:47 +0000 (19:46 +0100)]
Fix Insertion ActionMode not showing on RTL languages
When long pressing on an empty Text field with the system language set
to RTL, the "paste" popup was not showing up.
The Floating Toolbar requires a content rect to determine where the
text is and place itself close to it. In the case of an empty field,
we create a "fake" content rect by taking the placement of the cursor
+1 pixel to the right. In RTL languages, this +1 causes the content
rect to be considered off the bounds of the view, as the cursor is
aligned to the right, and hence the Floating Toolbar is hidden.
After making the rect a 0 width rect, we ran into the issue that
it was considered out of bounds due to the calculation ignoring rects
that simply touch the edge of the view's bounds.
BUG:
22540083
Change-Id: I29c79b701f586970b2611178233eff082b802ec1
Eino-Ville Talvala [Wed, 12 Aug 2015 20:01:44 +0000 (20:01 +0000)]
Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
Mike Dodd [Wed, 12 Aug 2015 18:53:48 +0000 (18:53 +0000)]
Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev
Mike Dodd [Wed, 12 Aug 2015 18:48:31 +0000 (18:48 +0000)]
Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."
This reverts commit
3a24898f5553e72589eaba3aeb5ef8f63909dd64.
Change-Id: I86de9a7fe9f72748c7ac33d9df7fd1fbd8007f7c
Adrian Roos [Wed, 12 Aug 2015 18:06:42 +0000 (18:06 +0000)]
Merge "Prevent overlap of color views in landscape" into mnc-dev
Jason Monk [Wed, 12 Aug 2015 17:59:22 +0000 (17:59 +0000)]
Merge "Fix tuner for secondary users" into mnc-dev
Mike Dodd [Wed, 12 Aug 2015 17:01:25 +0000 (17:01 +0000)]
Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
Todd Kennedy [Wed, 12 Aug 2015 16:51:13 +0000 (16:51 +0000)]
Merge "Promote system app permissions" into mnc-dev
Michael Wright [Wed, 12 Aug 2015 16:32:11 +0000 (16:32 +0000)]
Merge "Log last filtered sensor timestamp." into mnc-dev
Michael Wright [Wed, 12 Aug 2015 14:35:31 +0000 (15:35 +0100)]
Log last filtered sensor timestamp.
Bug:
22870354
Change-Id: Ib4efaa0f05bec81856c939c5c640eceff98d88ed
Todd Kennedy [Wed, 12 Aug 2015 15:26:15 +0000 (08:26 -0700)]
Promote system app permissions
When upgrading from a pre-M version of Android, install permissions for
exisiting system are promoted to runtime permissions. This only happens
for apps that existed prior to the OTA. Other system apps targeting M
are not automatically granted any permissions.
Bug:
22970710
Change-Id: I964ee3f93c66ea43fbb1be6b5ac6b09ddea3c385
Narayan Kamath [Tue, 11 Aug 2015 14:40:34 +0000 (15:40 +0100)]
Fall back to persist.sys.language/country if locale isn't set.
This will prevent users from losing their language setting when they
take an OTA to M.
bug:
23021286
Change-Id: Ifb66f6bf6a940ab745edac709321f3009ec6eab4
Alex Klyubin [Wed, 12 Aug 2015 05:42:29 +0000 (05:42 +0000)]
Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev
Lorenzo Colitti [Wed, 12 Aug 2015 03:38:57 +0000 (03:38 +0000)]
Merge "Don't attempt to stop the receive thread if we never started it." into mnc-dev
Jorim Jaggi [Tue, 11 Aug 2015 01:20:43 +0000 (18:20 -0700)]
Fix Keyguard drawn timeout
The timeout for waiting for Keyguard drawn was posted at the wrong
place. If the screen was turning on but the device wasn't waking up,
like in doze mode, we didn't post the timeout, thus, if Keyguard
wouldn't notify us, we would never unblock the screen. This doesn't
really cause a user visible bug but it *could*
prevent the screen from turning on if Keyguard doesn't behave nicely.
Put it at the right place so I can sleep better.
Bug:
21855614
Change-Id: Icda31399261b4ee80c292ce09a0858b0127e2999
Carlos Valdivia [Wed, 12 Aug 2015 01:42:19 +0000 (01:42 +0000)]
Merge "Fix deadlock." into mnc-dev
Julia Reynolds [Wed, 12 Aug 2015 01:19:01 +0000 (01:19 +0000)]
Merge "New landscape Navigation bar icons." into mnc-dev
Filip Gruszczynski [Wed, 12 Aug 2015 00:40:50 +0000 (00:40 +0000)]
Merge "When closing task stack remove reference to display content." into mnc-dev
Adrian Roos [Wed, 12 Aug 2015 00:36:43 +0000 (17:36 -0700)]
Prevent overlap of color views in landscape
Removes overlap from the color views which resulted in subotimal looks
when both color views were translucent and the nav bar was on the right
edge.
Also fixes a bug introduced in I2df7092a91eceeb815367ef917dd7289f4f2b27e
where the navigation-bar-on-right-side case got forgotten and caused
flickering in landscape when IMMERSIVE_STICKY was set but the navigation bar
was visible.
Bug:
22876533
Change-Id: I449a82eb3dc3f7b5051f26b37b362a196b4ff63a
Dianne Hackborn [Wed, 12 Aug 2015 00:34:56 +0000 (00:34 +0000)]
Merge "Fix issue #
23122445: Add 420 density" into mnc-dev
Wale Ogunwale [Wed, 12 Aug 2015 00:31:26 +0000 (00:31 +0000)]
Merge "Fixed issue with moveTaskToBack on single stack devices" into mnc-dev
Dianne Hackborn [Wed, 12 Aug 2015 00:18:53 +0000 (17:18 -0700)]
Fix issue #
23122445: Add 420 density
Change-Id: I15c113eb7e22f1d882db071c007224746f9d408f
Andres Morales [Thu, 6 Aug 2015 22:01:41 +0000 (15:01 -0700)]
[fingerprint] use credential owner in FingerprintService
Bug:
23027554
Change-Id: I185492b5008058fdb23a4536a8a73177ee4903d8
Winson Chung [Tue, 11 Aug 2015 22:53:51 +0000 (22:53 +0000)]
Merge "Always call onProvidersChanged() when packages containing widgets are updated." into mnc-dev
Chris Manton [Tue, 11 Aug 2015 22:19:39 +0000 (22:19 +0000)]
Merge "Save data registration roaming state" into mnc-dev
Carlos Valdivia [Tue, 11 Aug 2015 01:40:06 +0000 (18:40 -0700)]
Fix deadlock.
AccountManagerService can't ever synchronize on mUsers within a block of
code locked by UserAccounts.cacheLock. That will lead to deadlocks.
This change fixes a case where we were doing that in
getAccountsInternal(). Also I have purgeOldGrantsAll() run off the the
main thread.
Bug:
23036400
Change-Id: I8634691ca54c57a6e83633baba549226fdcd1064
Eino-Ville Talvala [Tue, 11 Aug 2015 20:33:37 +0000 (13:33 -0700)]
Camera: Fix framework bugs with DEPTH-only camera devices
Mostly due to no standard stream configurations being defined,
and for the correct overrides for DEPTH_POINT_CLOUD format.
Bug:
20537722
Change-Id: I8a18f5f68697a09dcc4d7555e51728193fe7f333
Winson [Tue, 11 Aug 2015 21:29:13 +0000 (14:29 -0700)]
Always call onProvidersChanged() when packages containing widgets are updated.
- In the existing logic, the call to onProvidersChanged() is called when a package
with widgets is added or removed, but only called when a package is updated _and_
there is an app widget bound to a host. This differs from what the expected
behavior is based on the documentation and means that packages with widgets that
update have no way of notifying host apps of changes except via package events.
Bug:
20698931
Change-Id: I60af36d51e99ca1ea751d9d9d03a50ef2d5bef98
Wale Ogunwale [Tue, 11 Aug 2015 20:54:42 +0000 (13:54 -0700)]
Fixed issue with moveTaskToBack on single stack devices
Icdad980eec64e081d15679600da07cf4431e40d6 allowed us to
properly return to the home acitvity when a task is moved
to back. However, this improperly moved the home task to
the front if it is the task we are moving to the back on
a single stack device. We now prevent the movement of the
home task to the front from happening.
Bug:
23088310
Change-Id: Ic21779cdb2d2007671d212d41fab5e68be2ae632
Diego Perez [Tue, 11 Aug 2015 20:44:40 +0000 (20:44 +0000)]
Merge "Make DelegateManager thread safe" into mnc-dev
Mike Dodd [Tue, 11 Aug 2015 20:14:53 +0000 (13:14 -0700)]
Set default SMS/MMS app to com.android.messaging (new AOSP app).
b/
23110861
Change-Id: I5ac753264222cb617027cf13527178a7e754a80b
Alan Viverette [Tue, 11 Aug 2015 19:34:27 +0000 (19:34 +0000)]
Merge "Don't re-wrap alert dialog context" into mnc-dev
Alan Viverette [Tue, 11 Aug 2015 19:33:55 +0000 (19:33 +0000)]
Merge "Ensure ripple mask is drawn at correct position" into mnc-dev
Julia Reynolds [Tue, 11 Aug 2015 14:33:04 +0000 (10:33 -0400)]
New landscape Navigation bar icons.
Bug:
22855920
Change-Id: I5127c8d0121aa90a1e52da1b51a86bac1c1b2fa1
Alan Viverette [Tue, 11 Aug 2015 19:02:42 +0000 (15:02 -0400)]
Don't re-wrap alert dialog context
Bug:
23038618
Change-Id: Iafe3a45096153d9fe656ad930cc3978d8fab1968
Alex Klyubin [Tue, 11 Aug 2015 13:41:13 +0000 (06:41 -0700)]
Add more examples of generating/importing keys to Javadocs.
Based on developer feedback, this updates Android Keystore Javadocs
with more examples of generating and importing keys of various
algorithms. This also clarifies that key use authorizations apply to
secret and private key and do no apply to public keys.
Bug:
23102874
Change-Id: If0dc20fda4836fd23b9cd9c92490a04e71b19fc0
Alan Viverette [Tue, 11 Aug 2015 18:25:45 +0000 (14:25 -0400)]
Ensure ripple mask is drawn at correct position
Bug:
22911708
Change-Id: Icdbe1f8a66d5e35eb25aa973c94f5870896cc1f8
Alan Viverette [Tue, 11 Aug 2015 18:24:04 +0000 (18:24 +0000)]
Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev
Jason Monk [Tue, 11 Aug 2015 18:18:14 +0000 (14:18 -0400)]
Fix tuner for secondary users
Bug:
23112000
Change-Id: I52aabdd1f345fb50e2c5015d233f4de3cc8d994d
Chris Manton [Mon, 10 Aug 2015 20:32:24 +0000 (13:32 -0700)]
Save data registration roaming state
Carrier configuration may override the roaming state
but the roaming state may be required for specifying
proper APNs upon data call setup. This change stores
the unmodified roaming state.
bug:
22990977
Change-Id: I5ebe04f60709bc691e9c79be193f1790a7148818
Alan Viverette [Tue, 11 Aug 2015 14:26:08 +0000 (10:26 -0400)]
Avoid use-after-free race condition when rebasing theme
... by never rebasing the theme. We don't need to do this unless the
system theme is configuration-dependent, which it is not currently.
Bug:
22943781
Change-Id: I96e695441543379e4d5fdf3cc6f18d9e6cf953b4
Daniel Sandler [Tue, 11 Aug 2015 14:17:45 +0000 (14:17 +0000)]
Merge "Crash apps with bad notification icons." into mnc-dev
Esteban Talavera [Tue, 11 Aug 2015 09:40:57 +0000 (09:40 +0000)]
Merge "Update setApplicationRestrictions documentation" into mnc-dev
Lorenzo Colitti [Tue, 11 Aug 2015 06:42:59 +0000 (15:42 +0900)]
Don't attempt to stop the receive thread if we never started it.
If socket initialization fails, DhcpState#exit will call
mReceiveThread#stop and crash the system with an NPE. Make sure
we don't do that if mReceiveThread is null, and properly null it
out when exiting.
Bug:
23088314
Change-Id: I4378d8280f9d8588f5eaa8bd7ade61beab1c3ce2
Andreas Gampe [Sat, 11 Jul 2015 04:46:17 +0000 (21:46 -0700)]
Frameworks/base: Disable Clang in core/jni
thread_local does not work with Clang at the moment.
Bug:
22414716
Change-Id: I4059b63a1621c346bfc72dbbec0b9cb165485e26
(cherry picked from commit
2bc67a1b5f9d4662ef7da4645ca8e580302b3553)
Winson Chung [Tue, 11 Aug 2015 02:33:15 +0000 (02:33 +0000)]
Merge "Pushing the startActivity before the calls to remove task." into mnc-dev
Jorim Jaggi [Tue, 11 Aug 2015 01:31:56 +0000 (01:31 +0000)]
Merge "Don't show fingerprint cancellation messages in keyguard" into mnc-dev
Dianne Hackborn [Tue, 11 Aug 2015 00:11:20 +0000 (00:11 +0000)]
Merge "Fix issue #
23037899: Support for Battery Optimization permission + Dialog" into mnc-dev
Winson [Thu, 6 Aug 2015 23:46:01 +0000 (16:46 -0700)]
Pushing the startActivity before the calls to remove task.
- It appears that there is contention between startActivityAsUser() and
removeTask() (called on two separate threads) which can cause jank when
a user removes all the tasks from their recents list. This CL ensures
that startActivityAsUser() is always run first so it is not blocked
by the other call (which should be able to run in the background
uninterrupted).
Bug:
22760556
Change-Id: I7564a2f0e43414686419d3657379bbd0ca6b4152
Matthew Williams [Mon, 10 Aug 2015 22:36:49 +0000 (22:36 +0000)]
Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev
Chris Tate [Mon, 10 Aug 2015 22:33:05 +0000 (22:33 +0000)]
Merge "Fix wifi disable during restore" into mnc-dev
Kevin Zhu [Mon, 29 Jun 2015 23:06:49 +0000 (16:06 -0700)]
DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED
BUG:
23086704
Cherry-picked from https://android-review.googlesource.com/#/c/162280/
When the screen goes off or dreaming start, an alarm will be
scheduled and idle state will be true when the alarm expired.
If the screen goes on or dreaming stop happens before
the alarm expired, the alarm isn't cancelled and idle state is
set to be true when the device is in SCREEN_ON or DREADING_STOPPED
state. There is also a case that Idle alarm triggered when
the screen on or dreaming stop just start to be processed.
ACTION_TRIGGER_IDLE will set mIdle to true during screen on
or dreaming stop.
In this patch, the alarm will be cancelled when the screen goes
on or dreaming stop and screen-on flag will be set. So the idle
state can only be set when screen is off or dreaming started.
Change-Id: Ic21a2394418ca55513ab932b3bfad1126b8769c1
Dianne Hackborn [Mon, 10 Aug 2015 21:52:52 +0000 (14:52 -0700)]
Fix issue #
23037899: Support for Battery Optimization permission + Dialog
New permission, new Intent action.
Change-Id: I1d9ba55be8f72074e29d33ad7a0a12a820bbac39
Simranjit Kohli [Mon, 10 Aug 2015 21:36:30 +0000 (21:36 +0000)]
Merge "[Fix getAccounts MANAGE_USERS permission]" into mnc-dev