Commit Graph

203042 Commits

Author SHA1 Message Date
Svet Ganov
f1be07928e am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev
* commit 'db8fa48ed0864125a07f2bbe078fd60abd875ac7':
  Return a result from Fragment#shouldShowRequestPermissionRationale
2015-07-16 19:26:05 +00:00
Svet Ganov
db8fa48ed0 Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 2015-07-16 19:16:59 +00:00
Robert Schaub
d8a869cb5b am 081649c2: am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
* commit '081649c2b5ffc1d9ea7a389cc9687659544a535e':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."
2015-07-16 19:11:02 +00:00
Robert Schaub
081649c2b5 am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
* commit 'f4db2de881d197db0dfd76645dfd7a95b1f8f0de':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."
2015-07-16 18:57:39 +00:00
Dianne Hackborn
cf5375d8a9 am 8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev
* commit '8983420d30d3e962c519d7f9a5d8b8ea4bc3f42c':
  Don't spam the system with unique wake lock names.
2015-07-16 18:45:54 +00:00
Robert Schaub
f4db2de881 am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
* commit '1b29a95789c29174d5e4d526f6449c2c354ef3b3':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."
2015-07-16 18:40:37 +00:00
Dianne Hackborn
8983420d30 Merge "Don't spam the system with unique wake lock names." into mnc-dev 2015-07-16 18:31:19 +00:00
Miao Wang
588f5739ac am d96243a1: am 10653cef: Merge "fix BNNM docs"
* commit 'd96243a1d7b2ce660b256694cd465b240e7413f1':
  fix BNNM docs
2015-07-16 18:28:21 +00:00
Robert Schaub
1b29a95789 Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs 2015-07-16 18:21:22 +00:00
Todd Kennedy
ff4b10d3cb am a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev
* commit 'a4911ed97102b638a373adcdae7e4c9b3c64cc30':
  Verfiy global apps with device owner
2015-07-16 18:18:45 +00:00
Miao Wang
d96243a1d7 am 10653cef: Merge "fix BNNM docs"
* commit '10653cef2ae7eb6e1dff1063ddde24347c350bae':
  fix BNNM docs
2015-07-16 18:13:51 +00:00
Miao Wang
10653cef2a Merge "fix BNNM docs" 2015-07-16 18:00:02 +00:00
Todd Kennedy
a4911ed971 Merge "Verfiy global apps with device owner" into mnc-dev 2015-07-16 17:59:35 +00:00
Miao Wang
3ef2041cee fix BNNM docs
bug: 22507076
Change-Id: I5fdffdde597d97b1dde77574d096b81bff4aa382
(cherry picked from commit d7d413ad0b)
2015-07-16 10:28:35 -07:00
Wale Ogunwale
fde33da13e am 11813232: Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev
* commit '1181323230478e3027bbabbbaf769dcd4a11a0e4':
  Animate app exit for cases where the app is already hidden before transition
2015-07-16 17:16:42 +00:00
John Reck
7e560444e7 am ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev
* commit 'ba4f0757779d6e91e52ebee0fd4c847b673a69e2':
  Don't crash on makeCurrent fail
2015-07-16 17:01:17 +00:00
Wale Ogunwale
1181323230 Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev 2015-07-16 17:01:15 +00:00
Svet Ganov
9e136b88ba Return a result from Fragment#shouldShowRequestPermissionRationale
bug:22523342

Change-Id: Ibacedec952316db705c57204fa448dbcada1c3e6
2015-07-16 09:58:43 -07:00
John Reck
ba4f075777 Merge "Don't crash on makeCurrent fail" into mnc-dev 2015-07-16 16:50:30 +00:00
Wale Ogunwale
b60c0f616c Animate app exit for cases where the app is already hidden before transition
It is possible for an app token to be marked as hidden and exiting
because the previous activity destory is completed before we are
good-to-go with app transition since we are still waiting for the
opening app to be done drawing. In this case we don't apply the
exiting animation since the token is not changing visibility state
during the app transition (it is already hidden and we are telling
it to hide...).
We now allow the animation to load if the token is already hidden
and marked as exiting.

Bug: 22381703
Change-Id: I5c27b6c3c1f810f05b2d716122055c6f12d0a167
2015-07-16 09:45:35 -07:00
Todd Kennedy
633f199831 Verfiy global apps with device owner
Applications installed for a specific user must be verfied as that user. However,
apps that are installed globally [i.e. UserHandle.ALL] should not be verified by
every user on the device. Instead, they should be verified by the device owner.

Bug: 21901423
Change-Id: I5fd3f690d08e7e911a3c86f09bbfcd4eb635b418
2015-07-16 09:44:31 -07:00
John Reck
f2dcc2aecb Don't crash on makeCurrent fail
Bug: 22444755

WindowManager may decide to yank the surface at any point, so
attempt to kinda handle this

Change-Id: Id2f665d2f0f93bccd4ec977fbf52dca4dc1ec891
2015-07-16 09:17:59 -07:00
Tony Mak
e90017d990 am 532737df: Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev
* commit '532737df65330200dc55ae42d31140d19c4024be':
  Fix calendar reminder notification is not shown in idle state
2015-07-16 15:04:00 +00:00
Tony Mak
532737df65 Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev 2015-07-16 14:50:19 +00:00
George Mount
5fb324adfe am bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev
* commit 'bd87b6b5b0c478c45d0dd5725cbc59995e751c64':
  Make additional shared elements a version-checked feature.
2015-07-16 14:29:51 +00:00
George Mount
7f35b0d2cc am 30c8245a: Merge "Add data binding to built javadoc." into mnc-dev
* commit '30c8245afc8d9558b76e5c86f917c22e02f6e820':
  Add data binding to built javadoc.
2015-07-16 14:29:44 +00:00
George Mount
bd87b6b5b0 Merge "Make additional shared elements a version-checked feature." into mnc-dev 2015-07-16 14:24:09 +00:00
George Mount
30c8245afc Merge "Add data binding to built javadoc." into mnc-dev 2015-07-16 14:19:12 +00:00
George Mount
2c256a04ae Make additional shared elements a version-checked feature.
Bug 22505481

ag/684544 added a feature to allow shared elements that weren't
shared into an Activity to be shared back. However, if you are
targeting an older version of the SDK, you may get an unexpected
shared element back. This change in behavior has been locked
behind a target version check.

Change-Id: I7162e24f3b14fedd6b308e89e9d04ac67660f7d6
2015-07-16 07:09:42 -07:00
Nicolas Prevot
0f2b3abf61 am dbdf7c45: Don\'t send app links to the parent if status = never (part 2)
* commit 'dbdf7c45380f7701e029a279932d2c97bf55fdc9':
  Don't send app links to the parent if status = never (part 2)
2015-07-16 11:12:47 +00:00
Neil Fuller
2b5dfb97ca am 98f3d953: am eccbc7c9: Merge "Fix NativeCrashListener"
* commit '98f3d95397a6213917171e1a03dc39719ece08ee':
  Fix NativeCrashListener
2015-07-16 10:59:07 +00:00
Neil Fuller
98f3d95397 am eccbc7c9: Merge "Fix NativeCrashListener"
* commit 'eccbc7c96f3f3dfa82f25362cf4ed0db3d9a6cb6':
  Fix NativeCrashListener
2015-07-16 10:42:05 +00:00
Neil Fuller
eccbc7c96f Merge "Fix NativeCrashListener" 2015-07-16 10:26:18 +00:00
Narayan Kamath
95b869e282 am 737106a6: am 1ecfdf33: Merge "docs: Add an explicit dependency on libcore/Docs.mk"
* commit '737106a61b0ceb2a6b92e7734b04900b174addce':
  docs: Add an explicit dependency on libcore/Docs.mk
2015-07-16 10:26:10 +00:00
Narayan Kamath
737106a61b am 1ecfdf33: Merge "docs: Add an explicit dependency on libcore/Docs.mk"
* commit '1ecfdf33ee593c0e80cee5e11f4c0a0fd0071233':
  docs: Add an explicit dependency on libcore/Docs.mk
2015-07-16 10:10:28 +00:00
Nicolas Prevot
dbdf7c4538 Don't send app links to the parent if status = never (part 2)
To qualify for cross-profile app linking, an intent should resolve
with a better status than "NEVER". Moved this check from canForwardTo
into the source method, getCrossProfileDomainPreferredLpr, to stop
bad resolutions leaking out.

BUG:22287521
Change-Id: I195979d78a783864d841a81f358780912bbf168e
2015-07-16 10:13:00 +01:00
Narayan Kamath
1ecfdf33ee Merge "docs: Add an explicit dependency on libcore/Docs.mk" 2015-07-16 08:57:17 +00:00
Narayan Kamath
c21739aec8 docs: Add an explicit dependency on libcore/Docs.mk
We include libcore sources in apicheck / docs targets so we must
regenerate the stubs or api definitions whenever the list of libcore
sources changes.

Change-Id: I9383015069bc4064d5d06d3d540047cd408e24c7
2015-07-16 08:57:05 +00:00
Vineeta Srivastava
d56efb4870 am 47e04090: Merge "Remove redundant cancel events from FingerprintService" into mnc-dev
* commit '47e0409062a2ac5a480fc1a57e443b75ce0f1dab':
  Remove redundant cancel events from FingerprintService
2015-07-16 07:18:31 +00:00
Vineeta Srivastava
47e0409062 Merge "Remove redundant cancel events from FingerprintService" into mnc-dev 2015-07-16 07:06:54 +00:00
Sanket Padawe
152c2e9af0 am ea975b12: Merge "Add new API for handling DB query per subId." into mnc-dev
* commit 'ea975b122fee3ac0fe766d2b58bb420b82e5dd95':
  Add new API for handling DB query per subId.
2015-07-16 05:13:59 +00:00
Sanket Padawe
ea975b122f Merge "Add new API for handling DB query per subId." into mnc-dev 2015-07-16 05:01:23 +00:00
Yohei Yukawa
979939ef76 am c0aa9744: Merge "PopupWindow position must be specified in window coordinates." into mnc-dev
* commit 'c0aa9744dc0ba9470aea6a973d955fd21de21c92':
  PopupWindow position must be specified in window coordinates.
2015-07-16 03:50:58 +00:00
Yohei Yukawa
a0d9be5a60 am ebbe7706: Merge "Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3." into mnc-dev
* commit 'ebbe77061c010596f79e61c3f1f7be12a3164b81':
  Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3.
2015-07-16 03:43:38 +00:00
Yohei Yukawa
c0aa9744dc Merge "PopupWindow position must be specified in window coordinates." into mnc-dev 2015-07-16 03:42:21 +00:00
Yohei Yukawa
ebbe77061c Merge "Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3." into mnc-dev 2015-07-16 03:31:56 +00:00
Yohei Yukawa
4b26997eeb PopupWindow position must be specified in window coordinates.
This CL addresses TODOs in Ib641dda49f7ab1c7d60207c36a47767bb408.

With this CL the position of PopupWindow is always specified in
window-local coordinates even if FloatingToolbar#mParent is not a
decor view.

Bug: 22335001
Change-Id: I0cdd63a00051fa30981e517c07682075467ac598
2015-07-15 19:01:32 -07:00
Yohei Yukawa
9b9d2c572f Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3.
This is a coment-only follow up CL for I71a8d356e868dc7715b030ca,
which wrongly changed coordinates from window-local to view-local
(relative to FloatingToolbar#mParent) when showing PopupWindow.

The position of PopupWindow still needs to be specified in
window-local coordinates as we had done before
I71a8d356e868dc7715b030ca1078da4ec39368c3.

Currently the problem might not be visible to users because
  1. FloatingToolbar is not a public API hence all the instances
     are under our controll.
  2. FloatingToolbar#mParent is alwasy initialized with
     PhoneWindow#getDecorView() for now.

Bug: 22335001
Change-Id: Ib641dda49f7ab1c7d60207c36a47767bb408971c
2015-07-15 19:00:18 -07:00
Jim Miller
80a776e5fe Remove redundant cancel events from FingerprintService
This fixes a bug where the framework was sending repeat cancel
events in response to terminal status (onAuthenticated(), onError())
which causes the underlying HAL implementation to get into a weird state.

Now, only client-initiated events like an explicit cancellation
or starting another authentication/enrollment invokes fingerprintd's
cancel() method.

Fixes bug 22438498

Change-Id: I762bab1c8635924848f9f4334db47a07130d5ae3
2015-07-15 18:57:14 -07:00
Chris Tate
3ad2f45be5 am a36c5580: Merge "Fix a bug disappearing installerPackageName info of packages after reboot." into mnc-dev
* commit 'a36c5580c503da98c137c5bf9f52a719a131d2a9':
  Fix a bug disappearing installerPackageName info of packages after reboot.
2015-07-16 01:28:08 +00:00