Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
204,969 Commits 3 Branches 0 Tags
ea9377628e0795178fe949726fa532758cb844bb
Commit Graph

50573 Commits

Author SHA1 Message Date
Raph Levien
ea9377628e am 5a6559ad: am a8a5706c: am dbc5dbbf: am abbe3136: am 441fc0fc: Merge "Fix problems with StaticLayout indentation" into mnc-dev 
* commit '5a6559ad5579422371235092938ea219626dd922':
  Fix problems with StaticLayout indentation
 2015-07-07 00:31:16 +00:00
Jeff Sharkey
3aeb218d0d am 6480393a: am c2e16e9b: am 63ba1d9e: am d58ddd82: am 246d6984: Merge "Handle missing migration source volume." into mnc-dev 
* commit '6480393a0dc4d96de6f58cf0a1420e82bc8203a0':
  Handle missing migration source volume.
 2015-07-07 00:30:45 +00:00
Jeff Sharkey
3bb8c85418 Merge commit '1db64c19' into merge3 
Change-Id: I0aea6817876a5820a7d67a4de5bef0f86ce702a2
 2015-07-06 17:25:00 -07:00
Eino-Ville Talvala
a0064c845d am 01235be6: am 5ee1eb82: am c883d823: am 3fc066f5: am 539d18c5: Merge "Camera2: Remove FREEFORM cropping requirement from FULL" into mnc-dev 
* commit '01235be6106e32421d7dd81a82f1e37ad51d8b3e':
  Camera2: Remove FREEFORM cropping requirement from FULL
 2015-07-06 20:05:00 +00:00
George Mount
ea9fced99f am 45f21c03: am e9bedb50: am e64f2011: am b3199092: am 20f71891: Merge "Fix Fade out during Activity Transition." into mnc-dev 
* commit '45f21c036ce80f39603c8ab43839afa5bc1529f8':
  Fix Fade out during Activity Transition.
 2015-07-06 20:04:36 +00:00
Barnaby James
93e96d365f am fa75f27d: am b908616f: am 413adbe2: am 2691d08c: am c1e3ac32: Merge "Minor doc fixes for VoiceInteractor." into mnc-dev 
* commit 'fa75f27ddf8a0faf13ce152cb6efae0dd0ce9b16':
  Minor doc fixes for VoiceInteractor.
 2015-07-06 19:32:06 +00:00
Raph Levien
15ebc8f447 am 12380d04: am 87798a13: am 4da2f05b: am 3be9eb46: am 401aa9d8: Merge "Clean up Hyphenator file reading" into mnc-dev 
* commit '12380d04e5eccb244e462b85bf89bc525c536510':
  Clean up Hyphenator file reading
 2015-07-06 19:31:52 +00:00
Raph Levien
5a6559ad55 am a8a5706c: am dbc5dbbf: am abbe3136: am 441fc0fc: Merge "Fix problems with StaticLayout indentation" into mnc-dev 
* commit 'a8a5706ca1b08dcf1e67c4def9a39dfeee8f9425':
  Fix problems with StaticLayout indentation
 2015-07-06 19:18:19 +00:00
Jeff Sharkey
6480393a0d am c2e16e9b: am 63ba1d9e: am d58ddd82: am 246d6984: Merge "Handle missing migration source volume." into mnc-dev 
* commit 'c2e16e9b923eaa17e6e0c7a96fe350b5cb7ad6d2':
  Handle missing migration source volume.
 2015-07-06 19:17:58 +00:00
Jeff Sharkey
1db64c1938 am ce0965e2: am 262c89dc: am d19555d9: am 38cae6c8: Merge "Reconcile private volumes when mounted." into mnc-dev 
* commit 'ce0965e2fa97e8a6c0ce493276ec265ffac8c072':
  Reconcile private volumes when mounted.
 2015-07-06 19:17:53 +00:00
Eino-Ville Talvala
01235be610 am 5ee1eb82: am c883d823: am 3fc066f5: am 539d18c5: Merge "Camera2: Remove FREEFORM cropping requirement from FULL" into mnc-dev 
* commit '5ee1eb82926381e40d7e239a743e6ac1f65b3577':
  Camera2: Remove FREEFORM cropping requirement from FULL
 2015-07-06 19:17:47 +00:00
George Mount
45f21c036c am e9bedb50: am e64f2011: am b3199092: am 20f71891: Merge "Fix Fade out during Activity Transition." into mnc-dev 
* commit 'e9bedb508a136609d63ecaa4cce6bb4a1b9fb212':
  Fix Fade out during Activity Transition.
 2015-07-06 19:17:31 +00:00
Barnaby James
fa75f27ddf am b908616f: am 413adbe2: am 2691d08c: am c1e3ac32: Merge "Minor doc fixes for VoiceInteractor." into mnc-dev 
* commit 'b908616f8d48ea9de92020f89ec4bfeb6b89582e':
  Minor doc fixes for VoiceInteractor.
 2015-07-06 19:17:15 +00:00
Raph Levien
12380d04e5 am 87798a13: am 4da2f05b: am 3be9eb46: am 401aa9d8: Merge "Clean up Hyphenator file reading" into mnc-dev 
* commit '87798a137ad221c4c900d0f0946559371ce00140':
  Clean up Hyphenator file reading
 2015-07-06 19:17:05 +00:00
Raph Levien
441fc0fc68 Merge "Fix problems with StaticLayout indentation" into mnc-dev 2015-07-06 18:08:41 +00:00
Jeff Sharkey
246d698499 Merge "Handle missing migration source volume." into mnc-dev 2015-07-06 17:57:52 +00:00
Jeff Sharkey
38cae6c8bc Merge "Reconcile private volumes when mounted." into mnc-dev 2015-07-06 17:57:46 +00:00
Eino-Ville Talvala
539d18c5a9 Merge "Camera2: Remove FREEFORM cropping requirement from FULL" into mnc-dev 2015-07-06 17:51:48 +00:00
George Mount
20f71891c4 Merge "Fix Fade out during Activity Transition." into mnc-dev 2015-07-06 17:25:46 +00:00
George Mount
a7478ab9a7 Fix Fade out during Activity Transition. 
Bug 22181705

The Fade Transition sets the transitionAlpha in onTransitionEnd.
I previously changed Visibility to only do it in onAnimationEnd,
so the onTransitionEnd overrides the Visibility's version. This
fixes that change.

Change-Id: I7df478897b6fcfec20999965e297925b65a1448b
 2015-07-06 10:23:13 -07:00
Barnaby James
c1e3ac321f Merge "Minor doc fixes for VoiceInteractor." into mnc-dev 2015-07-06 17:08:15 +00:00
Svet Ganov
f127f42fd4 am b017752a: am 6bc5b226: am c5a759cf: am d8c2bbcf: am 10c111ed: Merge "Show basic feature warning for default granted permissions" into mnc-dev 
* commit 'b017752aeb1d6d2ee961580de9edfc3db8722c8a':
  Show basic feature warning for default granted permissions
 2015-07-06 17:00:03 +00:00
Svet Ganov
727513cf32 am 62bb3744: am c084fa0f: am 018733d6: am e8b8d30a: am cb8d2e21: Merge "Improve request permission docs" into mnc-dev 
* commit '62bb374437fdb8941a08222d6a0cfb72da01ed38':
  Improve request permission docs
 2015-07-06 16:59:56 +00:00
Svet Ganov
b017752aeb am 6bc5b226: am c5a759cf: am d8c2bbcf: am 10c111ed: Merge "Show basic feature warning for default granted permissions" into mnc-dev 
* commit '6bc5b22630e7e9aa08f2f65a0452857ff3739c57':
  Show basic feature warning for default granted permissions
 2015-07-06 16:41:54 +00:00
Svet Ganov
62bb374437 am c084fa0f: am 018733d6: am e8b8d30a: am cb8d2e21: Merge "Improve request permission docs" into mnc-dev 
* commit 'c084fa0f1884ff58530e08ac493abed03748634e':
  Improve request permission docs
 2015-07-06 16:41:48 +00:00
Raph Levien
401aa9d807 Merge "Clean up Hyphenator file reading" into mnc-dev 2015-07-06 16:07:37 +00:00
Raph Levien
c3f2f7b93b Clean up Hyphenator file reading 
The old code made invalid assumptions about read() behavior and
failed to clean up properly in case of error. This patch changes the
file reading to use IoUtils.readFileAsString, which handles that.

Bug: 21020457
Change-Id: If9b54955c20a20a4ed5e8381d0c7e9c920d0639a
 2015-07-06 09:01:36 -07:00
George Mount
2f861323f0 am d931f16c: am 673f5920: am 9c4531e0: am e61668cb: am 7fe86c47: Merge "Fix docs for ViewAnimationUtils.createCircularReveal" into mnc-dev 
* commit 'd931f16cd795c7f11b833b761b2f65cac5d34d37':
  Fix docs for ViewAnimationUtils.createCircularReveal
 2015-07-06 15:57:01 +00:00
Svet Ganov
10c111ed35 Merge "Show basic feature warning for default granted permissions" into mnc-dev 2015-07-06 15:52:01 +00:00
Svet Ganov
cb8d2e2156 Merge "Improve request permission docs" into mnc-dev 2015-07-06 15:48:47 +00:00
George Mount
d931f16cd7 am 673f5920: am 9c4531e0: am e61668cb: am 7fe86c47: Merge "Fix docs for ViewAnimationUtils.createCircularReveal" into mnc-dev 
* commit '673f592061eb654a84f0f3fa2f48e51d29a32870':
  Fix docs for ViewAnimationUtils.createCircularReveal
 2015-07-06 15:47:31 +00:00
George Mount
7fe86c4753 Merge "Fix docs for ViewAnimationUtils.createCircularReveal" into mnc-dev 2015-07-06 14:39:41 +00:00
Neil Fuller
4a2171a81b am a8f4499c: am 93bb2bf2: am 761e39e1: Merge "Switch to using android.system.Os for more calls" 
* commit 'a8f4499c54f3375bc72a180bf19b932f114563c3':
  Switch to using android.system.Os for more calls
 2015-07-06 12:58:51 +00:00
Jeff Sharkey
ef10ee0145 Handle missing migration source volume. 
Users can try migrating primary storage while the current location
is missing/unmounted.  Fail gracefully instead of runtime restarting.

Bug: 21927076
Change-Id: I40645f8ccea05154e7cbacd188f6cba5f4dbbdc4
 2015-07-05 14:34:13 -07:00
Jeff Sharkey
6dce4964b4 Reconcile private volumes when mounted. 
Many things can happen while a private volume is ejected, so we need
to reconcile newly mounted volumes against known state.

First, user IDs can be recycled, so we store the serial number in the
extended attributes of the /data/user/[id] directory inode.  Since a
serial number is always unique, we can quickly determine if a user
directory "10" really belongs to the current user "10".  When we
detect a mismatched serial number, we destroy all data belonging to
that user.  Gracefully handles upgrade case and assumes current serial
number is valid when none is defined.

Second, we destroy apps that we find no record of, either due to
uninstallation while the volume was unmounted, or reinstallation on
another volume.

When mounting a volume, ensure that data directories exist for all
current users.  Similarly, create data directories on all mounted
volumes when creating a user.  When forgetting a volume, gracefully
uninstall any apps that had been installed on that volume.

Bug: 20674082, 20275572
Change-Id: I4e3448837f7c03daf00d71681ebdc96e3d8b9cc9
 2015-07-04 17:08:42 -07:00
Nicolas Prevot
ce9f639dc3 am 7c73c23d: am 38d7050d: am 2ee3beed: Merge "In NfcActivityManager, don\'t use UserHandle.CURRENT." into mnc-dev 
* commit '7c73c23dc7ffba5188fb07391e6555a62c807ea4':
  In NfcActivityManager, don't use UserHandle.CURRENT.
 2015-07-04 08:07:03 +00:00
Nicolas Prevot
92ebe9a289 am b06aece7: am d16f1252: am 60373e80: Merge "Fix the case where an intent bounces several times between users." into mnc-dev 
* commit 'b06aece751cc86aa859005bbb8843c5ed6be7c6f':
  Fix the case where an intent bounces several times between users.
 2015-07-04 08:06:54 +00:00
Abodunrinwa Toki
1156b48d5b am e91d7908: am 7099e39f: am 8fbe1a0c: Merge "Add accessibility actions for the PROCESS_TEXT feature." into mnc-dev 
* commit 'e91d790814144c7f9fda350aaa96132008020044':
  Add accessibility actions for the PROCESS_TEXT feature.
 2015-07-04 08:06:01 +00:00
Filip Gruszczynski
fb15033afc am 9fbb1696: am 545c5b38: am 9f8e1f5d: am aabc9869: am 03850591: Handle outsets when resized is called due to rotation. 
* commit '9fbb16964453087b3cc8a8eb63189c8f8bedbdb8':
  Handle outsets when resized is called due to rotation.
 2015-07-04 08:05:20 +00:00
Jeff Sharkey
6c1721509a am b959b1aa: am c6913187: am a5ed2c4d: Merge "Better handling of trim/benchmark results." into mnc-dev 
* commit 'b959b1aaea9fa64e3eb6cee7ce8e64d8a10657a3':
  Better handling of trim/benchmark results.
 2015-07-04 07:28:34 +00:00
Svet Ganov
e8ce8368fc am 55cd6f44: am 6fe87a56: am 68ffcf88: Merge "Teach receivers, activities, providers, and services app ops." into mnc-dev 
* commit '55cd6f44fd1e49164a999e948bb91a03a3b9daf6':
  Teach receivers, activities, providers, and services app ops.
 2015-07-04 07:28:18 +00:00
Keisuke Kuroyanagi
e2f22f8e56 am fd2b1f02: am 6ebe0bdc: am f3be3ddf: Merge "Fix: Selection handles can remain on home screen." into mnc-dev 
* commit 'fd2b1f024e85d8e612be1e1b8d1ded9a1ffdc4da':
  Fix: Selection handles can remain on home screen.
 2015-07-04 07:27:54 +00:00
Dianne Hackborn
9776c69790 am 9fac4c59: am 71b97214: am 36e52cdc: Merge "Device idle fixes: issue #22209630 and issue #22225665" into mnc-dev 
* commit '9fac4c590568ae86efe597456955cc4a42ddc8d9':
  Device idle fixes: issue #22209630 and issue #22225665
 2015-07-04 07:27:47 +00:00
Dianne Hackborn
19b16eb453 am b857216f: am ab33137d: am 6cc53743: Merge "Fix issue #20672970: Notifications are not dismissed on hot word detection" into mnc-dev 
* commit 'b857216f75bf18e702ead1e201cbbbc36fba39c6':
  Fix issue #20672970: Notifications are not dismissed on hot word detection
 2015-07-04 07:27:38 +00:00
Dianne Hackborn
7e07288c77 am 0783b9a4: am ee987ce4: am 76664d9d: Merge "Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW..." into mnc-dev 
* commit '0783b9a47ae682cc85a14284e79643b5087b8c9f':
  Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW...
 2015-07-04 07:27:17 +00:00
Ruben Brunk
d60e6af206 am 0197667a: am e0cabf8e: am e4ed4708: Merge "camera2: Fix ABI for new tags." into mnc-dev 
* commit '0197667ad672fae482366c4d5d86c8cf35286fb6':
  camera2: Fix ABI for new tags.
 2015-07-04 07:26:33 +00:00
Carlos Valdivia
822d900801 am 91bda049: am 46344f66: am 88817de8: Merge "Tweak GET_ACCOUNTS behavior and improve memory." into mnc-dev 
* commit '91bda0494e7d296220b2dec97f0a5165e95fca2b':
  Tweak GET_ACCOUNTS behavior and improve memory.
 2015-07-04 07:26:11 +00:00
Svetoslav
279a9a3131 am 90336427: am 56ef372f: am 29563632: Merge "Grant permissions to headless system calendar/contacts sync adapters." into mnc-dev 
* commit '90336427fd1fc85e15a43ce36a26576013061d91':
  Grant permissions to headless system calendar/contacts sync adapters.
 2015-07-04 07:25:45 +00:00
Neil Fuller
a8f4499c54 am 93bb2bf2: am 761e39e1: Merge "Switch to using android.system.Os for more calls" 
* commit '93bb2bf2e835f714d09b53dea3ca5d9e4451021e':
  Switch to using android.system.Os for more calls
 2015-07-04 02:58:40 +00:00
Svet Ganov
255aece7de Improve request permission docs 
bug:22252258

Change-Id: Ife19eb6b1e17b43a824379d2a039ff1c441bebdd
 2015-07-03 16:04:00 -07:00