Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,704 Commits 3 Branches 0 Tags
48c78cfb9e9c055ee97be0aaac02832f758ee396
Commit Graph

49246 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
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
Marco Nelissen
3ced96178b Merge "Use original path if translated path doesn't exist" into mnc-dev 2015-07-14 17:30:06 +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
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
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
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
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
Ian Pedowitz
d7be214ca4 resolved conflicts for merge of 8cee6587 to mnc-dr-dev 
Change-Id: I0b2ed52214bb097d7fd69434afd0c6c890b5afb3
 2015-07-13 22:58:29 -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
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
Christopher Tate
0e2010489e am b4494b02: am 288ecf98: Merge "Prioritize most-recently-enabled link-handling app" into mnc-dev 
* commit 'b4494b02d5700b4ef4058315d44f17c3d829c0ad':
  Prioritize most-recently-enabled link-handling app
 2015-07-14 01:11:20 +00:00
Christopher Tate
b4494b02d5 am 288ecf98: Merge "Prioritize most-recently-enabled link-handling app" into mnc-dev 
* commit '288ecf98f14c9eff639b0a3de074d5b4a06eccec':
  Prioritize most-recently-enabled link-handling app
 2015-07-14 00:59:52 +00:00
Christopher Tate
288ecf98f1 Merge "Prioritize most-recently-enabled link-handling app" into mnc-dev 2015-07-14 00:56:58 +00:00
Christopher Tate
f0d6cb38c4 Prioritize most-recently-enabled link-handling app 
In the case when multiple apps handle a given web-link action,
all of which have been marked as "launch the app instead of a
browser" and so are otherwise ambiguous, always prefer the app
that was most recently placed into the always-handle-links state.

Bug 22051035

Change-Id: I3f43c19b0d7b74e9843445e41971bb5433affb1c
 2015-07-13 17:01:14 -07:00
John Reck
72e8e0807a am 074b3ceb: am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev 
* commit '074b3ceb847ba2d9c9795b730c54a27ba412f158':
  Improve resource loading by ~3x
 2015-07-13 23:36:26 +00:00
Aravind Akella
f61d30ccdc am 42cae4ab: am 37511e35: Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev 
* commit '42cae4aba7412a87acbf267a0c60f5847bbf13cf':
  Log full class name of the client activating sensors for better debugging.
 2015-07-13 23:36:07 +00:00
Julia Reynolds
91941a57be am 19fd8658: am fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev 
* commit '19fd86589b87faf8e243c6c33be17390867e67bb':
  Remove personal/device group from sideloading screen.
 2015-07-13 23:35:48 +00:00
Billy Lau
0be2efb256 am f028ba3d: am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev 
* commit 'f028ba3db3d3b6478154952dbbd8ed7422ad14f6':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
 2015-07-13 23:35:14 +00:00
Zhijun He
cf00a86461 am a9fc8aa3: am 4fb81253: Camera metadata: fix typos. 
* commit 'a9fc8aa3c88e7b837be65abf6f3b0f3e2e9a4a1e':
  Camera metadata: fix typos.
 2015-07-13 23:35:09 +00:00
Raph Levien
073477a18e am 93a2c97d: am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev 
* commit '93a2c97dc71b211de1e9e3a7a64aa301309f3308':
  Improve Html.toHtml() documentation
 2015-07-13 23:34:55 +00:00
Carlos Valdivia
4e976dd141 am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev 
* commit 'cc3c93d30cd16597eb1e551d36237692cdb1299d':
  Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
 2015-07-13 23:33:31 +00:00
Mady Mellor
441ad4df23 am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev 
* commit '7fac4d6cc41cab81b2b2202725ae69782f9bcce9':
  Fix: line slop shouldn't always increase / decrease by one line
 2015-07-13 23:33:26 +00:00
Mady Mellor
9d4cd8cf48 am 24950db2: am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev 
* commit '24950db2768def06509e9bfd4ed6ecb47318f31d':
  Fix line slop issue at end of line for Thai & CJK
 2015-07-13 23:33:22 +00:00
Chris Craik
3b34b0061b am be10a866: am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev 
* commit 'be10a86620947bfee882c50ae725ceb10cbae98f':
  Reduce cost of span type checking
 2015-07-13 23:33:08 +00:00
John Reck
074b3ceb84 am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev 
* commit 'f96d9c5421b7df1c60024a0928639e18c6d96b7b':
  Improve resource loading by ~3x
 2015-07-13 23:03:25 +00:00
Aravind Akella
42cae4aba7 am 37511e35: Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev 
* commit '37511e35ae22ea88539f1137ea2f74c9cb17f60c':
  Log full class name of the client activating sensors for better debugging.
 2015-07-13 23:02:13 +00:00
Julia Reynolds
19fd86589b am fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev 
* commit 'fbd0a444e787c93ee8ef8741fcf24826a8619fcb':
  Remove personal/device group from sideloading screen.
 2015-07-13 23:01:53 +00:00
Billy Lau
f028ba3db3 am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev 
* commit '96d00ab359d60197321f06b4feb3d01f3fa03a29':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
 2015-07-13 23:00:54 +00:00
Zhijun He
a9fc8aa3c8 am 4fb81253: Camera metadata: fix typos. 
* commit '4fb81253edc726936d4b71b7e9c0789cab45e9da':
  Camera metadata: fix typos.
 2015-07-13 23:00:50 +00:00
Raph Levien
93a2c97dc7 am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev 
* commit '1b3d03512e7bc759d3cd340280d7a5c59195a063':
  Improve Html.toHtml() documentation
 2015-07-13 23:00:20 +00:00
Paul Crowley
140ff7a50b am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev 
* commit 'bac3d0936dfdb4d594873fd8690e8017e748ed96':
  Delete the user key when deleting a user.
 2015-07-13 22:34:51 +00:00
Paul Crowley
62d43bd9e8 am 9e0e6991: Merge "Use mount service to create user dirs." into mnc-dr-dev 
* commit '9e0e69915a2e45dd5ba158e0436571551a672636':
  Use mount service to create user dirs.
 2015-07-13 22:34:47 +00:00
Carlos Valdivia
cc3c93d30c am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev 
* commit '97cf0f1d76f1747302e0171c1cd4f0655fde99c4':
  Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
 2015-07-13 22:30:24 +00:00
Mady Mellor
7fac4d6cc4 am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev 
* commit '1c277ca8cd699b15e631342775d996404a75e660':
  Fix: line slop shouldn't always increase / decrease by one line
 2015-07-13 22:30:13 +00:00
Mady Mellor
24950db276 am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev 
* commit 'a9f07ccf38709be29137dec246bca7fea976a294':
  Fix line slop issue at end of line for Thai & CJK
 2015-07-13 22:30:08 +00:00
Chris Craik
be10a86620 am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev 
* commit '9f0049200824ae523a6cd39b9866c709d42e3075':
  Reduce cost of span type checking
 2015-07-13 22:29:36 +00:00