drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
241,007 Commits 1 Branch 0 Tags
Commit Graph

241007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
1415d26786 Merge "Don't hold lock when calling externally" into nyc-dev 2016-04-27 01:45:13 +00:00
Svetoslav Ganov
cab51643e7 Merge "Replace null checks is null object checks" into nyc-dev 2016-04-27 01:39:25 +00:00
Svetoslav Ganov
fedb230213 Replace null checks is null object checks 
A recent change replaced the null state during a setting
lookup with a null object, however missed to update some
null checks to be null object ones.

bug:28405145

Change-Id: I80f0fb3ac6e64f4283b6c617283a009e97a40efe
 2016-04-26 18:36:47 -07:00
TreeHugger Robot
e597323939 Merge "Terminate DocumentsUI opened for the specific root." into nyc-dev 2016-04-27 01:18:44 +00:00
Scott Main
2d22afc3a1 Merge "resolve merge conflicts of 886bbdb to nyc-dev" into nyc-dev 2016-04-27 01:11:20 +00:00
Tomasz Mikolajewski
b56bc29657 Merge "Exclude virtual files from ACTION_SEND." into nyc-dev 2016-04-27 01:11:04 +00:00
smain@google.com
fce137748a resolve merge conflicts of 886bbdb to nyc-dev 
Change-Id: Ib6a009d086ff9f4c3a568124170cd6203f1b385b
 2016-04-26 18:09:06 -07:00
Chong Zhang
08eb8a1aa2 Merge "Finish immediately if the resumed activity is already visible" into nyc-dev 2016-04-27 01:08:17 +00:00
TreeHugger Robot
97ef0e77af Merge "Don't override pre-release target sdk" into nyc-dev 2016-04-27 00:53:19 +00:00
Rob Carr
69a6fe321c Merge "Fix bugs with takeSurface and preserveWindows." into nyc-dev 2016-04-27 00:47:59 +00:00
Android Build Merger (Role)
7f17d27e89 Merge "Merge "Docs: Minor edit to IR docs to mention longer intial/clean builds" into mnc-mr-docs am: e60e315 am: f2a8f83 am: 86eb9f3" into nyc-dev 2016-04-27 00:43:24 +00:00
Adarsh Fernando
52c591d1b7 Merge "Docs: Minor edit to IR docs to mention longer intial/clean builds" into mnc-mr-docs am: e60e315 am: f2a8f83 
am: 86eb9f3

* commit '86eb9f3770faf3fbae439d583db31a5055a06625':
  Docs: Minor edit to IR docs to mention longer intial/clean builds

Change-Id: I52767d1d4a5b0421611056747f0f8bb41c548ae7
 2016-04-27 00:40:09 +00:00
TreeHugger Robot
fc5f6e6c80 Merge "Fix two multi-user bugs in package upgrade." into nyc-dev 2016-04-27 00:39:42 +00:00
TreeHugger Robot
e542e0cb9b Merge "Set installed flag of all users if system app is installed later" into nyc-dev 2016-04-27 00:32:41 +00:00
Tomasz Mikolajewski
52036c743c Merge "Fix index computation for quick viewing." into nyc-dev 2016-04-27 00:30:46 +00:00
Rob Carr
4f40766360 Merge "Touch region fixes for dialogs and overlapping tasks." into nyc-dev 2016-04-27 00:29:59 +00:00
smain@google.com
49d7803f04 resolve merge conflicts of 946609b to nyc-dev 
Change-Id: Ic96e9e78d16255bfd2fc43df5180c2b1a766ea2d
 2016-04-26 17:25:09 -07:00
Todd Kennedy
d5e295f919 Don't hold lock when calling externally 
Wound up in a deadlock. We held mPackages lock and called the mount
service. This called into the AppOps service which tried to obtain
its lock. On another thread, we held the AppOps service lock which
called into PackageManager service and tried to take mPackages.

Ideally, we'd never hold an internal lock when calling externally.
In practice, that's not always fixable [for example, code change
would be too great to not hold the AppOps lock when calling into
the PackageManager service].

Bug: 28169075
Change-Id: If0a7f1361c7be9385b1f629f68ebc0556b08ab06
 2016-04-26 17:06:38 -07:00
Jeff Sharkey
ee6d8be53e Merge "Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."" into nyc-dev 2016-04-27 00:04:02 +00:00
Chong Zhang
b60a830f8b Merge "Request a wallpaper update pass when wallpaper target is set to visible" into nyc-dev 2016-04-26 23:29:40 +00:00
Chong Zhang
83c4135a3a Merge "Do not set waitForDebugger if the process to be debugged already started" into nyc-dev 2016-04-26 23:28:06 +00:00
Erik Kline
844ee77b6a Merge "Move IPv4 address setting to IpManager" into nyc-dev 2016-04-26 23:27:48 +00:00
Todd Kennedy
b107271813 Don't override pre-release target sdk 
If a package targets a pre-release SDK [eg a letter version] it should not
be allowed to be upgraded by a release SDK [eg a number version]. If one
absolutely must upgrade to a release SDK, use the "--force-sdk" option
during install.

Bug: 28345311
Change-Id: Ic9fb209968e7c5da2c80c5ca4c0f44f5125f610a
 2016-04-26 16:25:43 -07:00
Chong Zhang
efd9a5ba01 Finish immediately if the resumed activity is already visible 
When in FINISH_AFTER_VISIBLE mode, we need to check visibility of
both the current activity, and the activity to be resumed. If the
resumed activity is already visible, we should finish immediately.
We can't put it into stopping state and wait because there won't be
a window visible callback from the next activity.

bug: 28378359

Change-Id: Ib1fb44acfec33616da76f48102cc00b453e41914
 2016-04-26 16:24:24 -07:00
Jeff Sharkey
e75c0b9873 Fix two multi-user bugs in package upgrade. 
When upgrading a package, we need to fill in the "origUsers" field
so that we can clone the installed state correctly.  This was done
for child package, but never set for the parent package.

Also fix a bug where a secondary user requested a package to be
moved.  Because that move was pushed onto a Handler, the calling
userId appeared to be the device owner instead of the user that
actually requested the move.  (Later in the upgrade flow there is
code that force-installs the package for the requesting user.)

Bug: 26729822
Change-Id: I2d2a007c73558f29a3f8c1408ec373fce6e87761
 2016-04-26 17:01:42 -06:00
Oren Blasberg
c71b6302fe Merge "Show cascading popup menus if screen is big enough." into nyc-dev 2016-04-26 22:43:39 +00:00
Chen Xu
73efde04ef Merge "Add CarrierConfig for metered roaming" into nyc-dev 2016-04-26 22:42:18 +00:00
Oren Blasberg
a86d1e0b59 Merge "Accommodate NaN in new context menu methods." into nyc-dev 2016-04-26 22:41:01 +00:00
Oren Blasberg
0967da3989 Merge "Don't show icons for top level menus unless forced." into nyc-dev 2016-04-26 22:38:58 +00:00
Shreyas Basarge
8fcf6a6922 Merge "Account info on job wakelocks" into nyc-dev 2016-04-26 22:36:47 +00:00
Ruben Brunk
f84b3e0e2f Merge "Add manifest attribute for VR activities." into nyc-dev 2016-04-26 22:05:30 +00:00
Android Build Merger (Role)
5475c951bc Merge "Merge "docs: URL and App Indexing API updates for AS 2.0 support b/26642964" into mnc-docs am: cffbbc8 am: 8af8d4d am: 13308fc2 am: 39579d7" into nyc-dev 2016-04-26 21:58:53 +00:00
Android Build Merger (Role)
359b10d739 Merge "Merge "update Develop tab landing page with Studio 2.0 announcement." into mnc-mr-docs am: b9709f6 am: c4ec690 am: 73b5cc9" into nyc-dev 2016-04-26 21:58:43 +00:00
Android Build Merger (Role)
3b934467d4 Merge "change Mac JDK requirement to 6 am: 611a2f4 am: 3b1f66c am: 0619ef2" into nyc-dev 2016-04-26 21:58:33 +00:00
Android Build Merger (Role)
c5f684f6f7 Merge "Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs am: 3dbc405 am: 6eed040 am: f654443" into nyc-dev 2016-04-26 21:58:22 +00:00
Android Build Merger (Role)
7a82b58a8a Merge "Docs: Added Android Plugin for Gradle v2.0.0 Release Notes am: b896cd1 am: abb5afc am: fe47b6d" into nyc-dev 2016-04-26 21:58:11 +00:00
Android Build Merger (Role)
b14b1fd9fa Merge "Merge "Docs: Added instructions to launch instrumented tests in AS using CTL" into mnc-mr-docs am: 7961413 am: 88d1e91 am: 8776f89" into nyc-dev 2016-04-26 21:58:03 +00:00
Android Build Merger (Role)
da816e80bc Merge "Update studio landing page and add all-new install flow docs. bug: 27850063 (update system reqs for 2.0) bug: 27725026 (update download page for 2.0) bug: 23908299 (clean up download and get started) am: 9577d31 am: fc35cf2 am: 478463a" into nyc-dev 2016-04-26 21:57:53 +00:00
Android Build Merger (Role)
5a073da32b Merge "Merge "docs: "Result is:" paragraph now in correct position on page." into mnc-mr-docs am: 7c909cc am: 090e5fb am: 5f6a355" into nyc-dev 2016-04-26 21:57:42 +00:00
Android Build Merger (Role)
239d2c2ea2 Merge "Merge "docs: Added new partner logos to the car brands section of auto index page." into mnc-docs am: 63f15a9 am: e7b8c79 am: 29c6f81 am: 26ed50a" into nyc-dev 2016-04-26 21:57:32 +00:00
Android Build Merger (Role)
9dd786c7ee Merge "Merge "Add missing </pin-set>" into mnc-mr-docs am: 5f415c2 am: 0ed59f9 am: f1ac8fa" into nyc-dev 2016-04-26 21:57:21 +00:00
Android Build Merger (Role)
c41d00358c Merge "Merge "Fix application manifest XML" into mnc-mr-docs am: c8dcc2b am: 3fdc800 am: fc688ec" into nyc-dev 2016-04-26 21:57:12 +00:00
Android Build Merger (Role)
124260fe65 Merge "Merge "docs: April 2016 Dashboard update" into mnc-mr-docs am: 4ec3749 am: 83113d6 am: 824429f" into nyc-dev 2016-04-26 21:57:04 +00:00
Android Build Merger (Role)
641fbbd3f3 Merge "Merge "Revert "Updates for Play" April Fool\'s joke." into mnc-mr-docs am: 242f06cd am: 0015bf0 am: bb64fe3" into nyc-dev 2016-04-26 21:56:54 +00:00
Android Build Merger (Role)
8b10dd2054 Merge "Merge "Updates for Play." into mnc-mr-docs am: 3afd52a am: f4658e2 am: ab3721a" into nyc-dev 2016-04-26 21:56:46 +00:00
Android Build Merger (Role)
ae9e686ffc Merge "Merge "docs: Add note about missing recording functionality in Live Channels" into mnc-mr-docs am: cac018b am: 9e16ddc am: 461e731" into nyc-dev 2016-04-26 21:56:26 +00:00
Android Build Merger (Role)
df5e1470aa Merge "Merge "docs: Fixed namespace shown in a line of style XML" into mnc-mr-docs am: 2f5a204 am: ddbf8d2c am: f63a1c4" into nyc-dev 2016-04-26 21:56:15 +00:00
Android Build Merger (Role)
d3ca191a3f Merge "Merge "docs: Removed dead link in "create project" TOC." into mnc-mr-docs am: f380435 am: 0da507d am: 7f0d4d0" into nyc-dev 2016-04-26 21:56:04 +00:00
Android Build Merger (Role)
a7435670fd Merge "Merge "docs: Corrected reference link for NotificationManager.notify()." into mnc-mr-docs am: c9afecd am: 1c076e8 am: 8d336e6" into nyc-dev 2016-04-26 21:55:55 +00:00
Android Build Merger (Role)
96eaf3e12d Merge "Merge "docs: Added missing semicolon within code sample." into mnc-mr-docs am: 9deafe5 am: fcf68ef am: c56d885" into nyc-dev 2016-04-26 21:55:45 +00:00