Commit Graph

197704 Commits

Author SHA1 Message Date
Marco Nelissen
48c78cfb9e am c56668eb: am 3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev
* commit 'c56668eb223fe45ff5c1e399d99943838320c407':
  Use original path if translated path doesn't exist
2015-07-14 17:49:56 +00:00
Craig Lafayette
7df8b2658f am d86ab3c5: am 2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-dev
* commit 'd86ab3c539cd548d54620edf8836546695dd7424':
  Prevent null allowableAccounts from crashing
2015-07-14 17:49:51 +00:00
Chris Craik
9f43ac777a am e2a5c184: am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev
* commit 'e2a5c184e396b748e390672996ebeca25c2b9b83':
  Fix unsafety in SkiaShader storage, and texture unit accounting
2015-07-14 17:49:47 +00:00
Marco Nelissen
c56668eb22 am 3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev
* commit '3ced96178b1b132705e773736cbb707a3a0cd951':
  Use original path if translated path doesn't exist
2015-07-14 17:36:07 +00:00
Craig Lafayette
d86ab3c539 am 2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-dev
* commit '2f0116fa3ab2153188e43e87b194afae7e4efb81':
  Prevent null allowableAccounts from crashing
2015-07-14 17:36:02 +00:00
Chris Craik
e2a5c184e3 am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev
* commit '941bcedb4c03832cd54225217697c7b8cba6e07c':
  Fix unsafety in SkiaShader storage, and texture unit accounting
2015-07-14 17:35:50 +00:00
Marco Nelissen
3ced96178b Merge "Use original path if translated path doesn't exist" into mnc-dev 2015-07-14 17:30:06 +00:00
Craig Lafayette
2f0116fa3a Merge "Prevent null allowableAccounts from crashing" into mnc-dev 2015-07-14 17:25:40 +00:00
Chris Craik
941bcedb4c Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev 2015-07-14 16:58:01 +00:00
Alex Klyubin
21a0f80f87 am 5eaf2412: am 10633c96: Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-dev
* commit '5eaf24126d4496f9a157280007b8bb89500a3ea1':
  Fix Android Keystore key factories to obey JCA contract.
2015-07-14 16:46:12 +00:00
Alex Klyubin
5eaf24126d am 10633c96: Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-dev
* commit '10633c96b55d13f05304b758b01be48035adece3':
  Fix Android Keystore key factories to obey JCA contract.
2015-07-14 16:28:28 +00:00
Alex Klyubin
10633c96b5 Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-dev 2015-07-14 16:16:03 +00:00
Yohei Yukawa
17dce3432f am be27832b: am 12952c79: Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-dev
* commit 'be27832bba3291be6eb11cc449c9730ea265f3dc':
  Allow FloatingToolbar to be outside of the attached window.
2015-07-14 15:59:22 +00:00
Ronghua Wu
16567cf24d am 70250d35: am 148c7c5c: Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev
* commit '70250d3597091c03c28050f4c3e17af8f0295bc0':
  media: Implement getAchievableFrameRatesFor with measured frame rate.
2015-07-14 15:45:20 +00:00
Yohei Yukawa
be27832bba am 12952c79: Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-dev
* commit '12952c79528cd7ea804c400e5908a24e56f69bbe':
  Allow FloatingToolbar to be outside of the attached window.
2015-07-14 15:45:05 +00:00
Yohei Yukawa
12952c7952 Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-dev 2015-07-14 15:35:57 +00:00
Ronghua Wu
70250d3597 am 148c7c5c: Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev
* commit '148c7c5c1794a9e306660f22c7cbbbc9906e5f5e':
  media: Implement getAchievableFrameRatesFor with measured frame rate.
2015-07-14 15:33:25 +00:00
Marco Nelissen
aa41103668 Use original path if translated path doesn't exist
Bug: 22376538
Change-Id: I2f6af4fa31c097e2e2d619a068cf83721091c450
2015-07-14 08:25:23 -07:00
Ronghua Wu
148c7c5c17 Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev 2015-07-14 15:21:34 +00:00
Craig Lafayette
3c9c71d36e Prevent null allowableAccounts from crashing
The javadoc for newChooseAccountIntent says that a null
value for the allowableAccounts parameter is valid and
an acceptable default. This CL makes sure that when this
parameter is null, a NullPointerException is not thrown.

Bug: 22475546
Change-Id: Ieb0d67dd02628e1ae5629499b3be3c6382efc9aa
2015-07-14 11:09:58 -04:00
Andrei Stingaceanu
31ccc9f0e0 am a7e2ab6e: am 8af7432c: Merge "Fix "Select All" in extracted mode" into mnc-dev
* commit 'a7e2ab6ec68d277cc9a8aa3fd51911ba48f271e0':
  Fix "Select All" in extracted mode
2015-07-14 14:30:20 +00:00
Andrei Stingaceanu
a7e2ab6ec6 am 8af7432c: Merge "Fix "Select All" in extracted mode" into mnc-dev
* commit '8af7432ca3fc1ce3539997d24439954f0e64134c':
  Fix "Select All" in extracted mode
2015-07-14 14:17:48 +00:00
Julia Reynolds
2ed576fa6c am 66b73dce: am f5e20ec3: Merge "Retrieve resources for apps, even if not installed for current user." into mnc-dev
* commit '66b73dcee2cb885ad0dc35a25fcb93bdc586ea30':
  Retrieve resources for apps, even if not installed for current user.
2015-07-14 14:10:24 +00:00
Andrei Stingaceanu
8af7432ca3 Merge "Fix "Select All" in extracted mode" into mnc-dev 2015-07-14 14:03:23 +00:00
Julia Reynolds
66b73dcee2 am f5e20ec3: Merge "Retrieve resources for apps, even if not installed for current user." into mnc-dev
* commit 'f5e20ec36480897f4c37fd63554872e74d874f02':
  Retrieve resources for apps, even if not installed for current user.
2015-07-14 13:55:45 +00:00
Julia Reynolds
f5e20ec364 Merge "Retrieve resources for apps, even if not installed for current user." into mnc-dev 2015-07-14 13:47:44 +00:00
Julia Reynolds
c7fd3462a2 Retrieve resources for apps, even if not installed for current user.
Bug: 21448052
Change-Id: Id5db428a6faca4a905684088c47e070752ac2899
2015-07-14 09:24:22 -04:00
Yohei Yukawa
bafc908304 Allow FloatingToolbar to be outside of the attached window.
Currently PopupWindow used for the floating toolbar specifies
neither FLAG_LAYOUT_NO_LIMITS nor FLAG_LAYOUT_IN_SCREEN.
As a result, the floating toolbar can overlap the selected
text when the attached window does not have enough height.

Here is the repro code.

    final TextView textView = new TextView(this);
    textView.setLayoutParams(
            new ViewGroup.LayoutParams(
                    ViewGroup.LayoutParams.MATCH_PARENT,
                    ViewGroup.LayoutParams.WRAP_CONTENT));
    textView.setText("A test sentence.");
    textView.setTextIsSelectable(true);
    final AlertDialog dialog = new AlertDialog.Builder(this)
            .setView(textView)
            .create();
    dialog.getWindow().setGravity(Gravity.BOTTOM)
    dialog.show();

If you tap a word in the dialog, the floating toolbar
unintentionally overlaps the selected text due to the limited
height of the AlertDialog.

It also turns out that just calling
  PopupWindow.setClippingEnabled(false)
to specify FLAG_LAYOUT_NO_LIMITS is not sufficient and ends up
showing the toolbar on the NavBar because we have mistakenly
compared bounds in window-local coordinates
(e.g. FloatingActionModemContentRectOnWindow) with bounds in
screen coordinates (e.g. FloatingActionMode#mScreenRect).
Hence the confusion of window-local coordinates and screen
coordinates in FloatingToolbar and FloatingToolbar also needs
to be addresses.

To summarize here are the notable changes in this CL:
  - Specify FLAG_LAYOUT_NO_LIMITS so that the floating
    toolbar can be placed outside of the attached window.
    (We do this with PopupWindow#setClippingEnabled)
  - Switch to use screen coordinates from window-local
    coordiantes in FloatingToolbar and FloatingActionMode
    because some system components such as WindowManager
    prefer screen coordinates.
  - Put -OnScreen suffix for Rect and Point variables
    as long as they are in screen coordinates.

Bug: 22335001
Change-Id: I71a8d356e868dc7715b030ca1078da4ec39368c3
2015-07-14 05:59:05 -07:00
Andrei Stingaceanu
5396c131c0 Fix "Select All" in extracted mode
Stop calling onExtractTextContextMenuItem if "Select All"
is selected (the action does not modify text thus does
not need batch editing). Editor#finishBatchEdit reports
that text changed which in turn can stop the action mode
and the selection after it was started by onPreDraw.

Bug: 22059417
Change-Id: I5354cbe4bae374e0d5f3de39616336170ee33b92
2015-07-14 11:37:28 +01:00
Andrei Stingaceanu
2e59771e74 am 0e6360f4: am a9b9907f: Merge "Fix insertion handle disappearing in extract mode" into mnc-dev
* commit '0e6360f4542f266a2f1d7ba9fb802bffa6001b9b':
  Fix insertion handle disappearing in extract mode
2015-07-14 10:28:00 +00:00
Andrei Stingaceanu
0e6360f454 am a9b9907f: Merge "Fix insertion handle disappearing in extract mode" into mnc-dev
* commit 'a9b9907f3c472e70d0950964d3e2c83c4926af14':
  Fix insertion handle disappearing in extract mode
2015-07-14 10:14:22 +00:00
Andrei Stingaceanu
a9b9907f3c Merge "Fix insertion handle disappearing in extract mode" into mnc-dev 2015-07-14 09:57:24 +00:00
Zach Johnson
ae2aaebb8c am 7bcb9597: Fix BluetoothSocket file descriptor leak
* commit '7bcb9597c8ae90e22ee9efff6f64cf3e2065e5dc':
  Fix BluetoothSocket file descriptor leak
2015-07-14 06:17:00 +00:00
Erik Kline
32cfbc9d72 am 68bc390c: am 77612940: Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev
* commit '68bc390c0ab592b86b93e153fcc0c0dd51545e44':
  Log NetworkRequestInfo to get more detailed history
2015-07-14 06:15:51 +00:00
Zach Johnson
72407cb5e3 am 19ab3b47: am 569ff225: Fix BluetoothSocket file descriptor leak
* commit '19ab3b47cbac8267c8499d96fc182a0e898554e0':
  Fix BluetoothSocket file descriptor leak
2015-07-14 06:15:47 +00:00
Svet Ganov
5b93f2d92f am 4248250c: am 8017c647: Fix build
* commit '4248250c936ded1d5c32b47681817c52f0600c7e':
  Fix build
2015-07-14 06:15:42 +00:00
Ian Pedowitz
80ea6c798d am d7be214c: resolved conflicts for merge of 8cee6587 to mnc-dr-dev
* commit 'd7be214ca469c593d8a59cf7404020f4ad1aaed9':
  Teach storage appops.
2015-07-14 06:15:38 +00:00
Erik Kline
68bc390c0a am 77612940: Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev
* commit '776129402746be08d52bb9f0901f6ecd63b25399':
  Log NetworkRequestInfo to get more detailed history
2015-07-14 06:07:04 +00:00
Zach Johnson
19ab3b47cb am 569ff225: Fix BluetoothSocket file descriptor leak
* commit '569ff225a3879363bb31548a664161fee5270a0d':
  Fix BluetoothSocket file descriptor leak
2015-07-14 06:07:00 +00:00
Svet Ganov
4248250c93 am 8017c647: Fix build
* commit '8017c647e665a6b6240501dc43628143ebe4e333':
  Fix build
2015-07-14 06:06:55 +00:00
Ian Pedowitz
d7be214ca4 resolved conflicts for merge of 8cee6587 to mnc-dr-dev
Change-Id: I0b2ed52214bb097d7fd69434afd0c6c890b5afb3
2015-07-13 22:58:29 -07:00
Zach Johnson
7bcb9597c8 Fix BluetoothSocket file descriptor leak
Sockets accepted on a server socket didn't populate
the mPfd field, which is used to close out the java
end of the native-and-java communication socket when
the overall rfcomm socket is closed. #badnewsbears

b/21398841

Change-Id: I3adb0a9965f83d0f3006fa4f79ea4abeab5c9a17
2015-07-13 22:50:13 -07:00
Erik Kline
7761294027 Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev 2015-07-14 04:09:29 +00:00
Zach Johnson
569ff225a3 Fix BluetoothSocket file descriptor leak
Sockets accepted on a server socket didn't populate
the mPfd field, which is used to close out the java
end of the native-and-java communication socket when
the overall rfcomm socket is closed. #badnewsbears

b/21398841

Change-Id: I3adb0a9965f83d0f3006fa4f79ea4abeab5c9a17
2015-07-14 03:40:49 +00:00
Erik Kline
7523eb349e Log NetworkRequestInfo to get more detailed history
Bug: 21641983
Bug: 22235775
Bug: 22299819
Bug: 22358164
Change-Id: I48a2d162dd499a3590f06d805267a63822856969
2015-07-14 11:46:51 +09:00
Svet Ganov
8017c647e6 Fix build
Change-Id: I2c97e405eaec7ee1569fcddc872ff2a98c829efe
2015-07-14 02:38:07 +00:00
Christopher Tate
d04c91ab33 am c5eadf8d: am 4b9b3e47: Merge "Default browser should not supersede intent filter priorities" into mnc-dev
* commit 'c5eadf8d889b7e8901d647502d22a0d0c108d1da':
  Default browser should not supersede intent filter priorities
2015-07-14 01:30:17 +00:00
Svet Ganov
f12fb43c2b am 7ca0c42d: am fc2bc7f1: Merge "Check signatures of privileged persistent apps for granting defailt permissions" into mnc-dev
* commit '7ca0c42db549fee52d61124be5a2c739f5abdd4a':
  Check signatures of privileged persistent apps for granting defailt  permissions
2015-07-14 01:30:12 +00:00
Svet Ganov
8cee6587e0 Merge "Teach storage appops." into mnc-dev 2015-07-14 01:24:37 +00:00
Svet Ganov
6ee871e598 Teach storage appops.
For modern apps targeting M SDK and up the external storage state
is deterined by granted permissions. For apps targeting older SDK
the storage access is determined by app ops correspning to the
storage permissions as the latter are always granted.

When app ops change we do not remount as we kill the app process
in both cases enabling and disabling an app op since legacy code
is not prepared for dynamic behavior where an operation that failed
may next succeed. Hence, we remount when we start the app.

For modern apps we don't kill the app process on a permission
grant, therefore we synchronously remount the app storage.

bug:22104923

Change-Id: I601c19c764a74c2d15bea6630d0f5fdc52bf6a5a
2015-07-13 18:22:30 -07:00