OSDN Git Service

android-x86/frameworks-base.git
8 years agoOpen MTP device on demand.
Daichi Hirono [Mon, 1 Feb 2016 04:00:31 +0000 (13:00 +0900)]
Open MTP device on demand.

Previously MtpDocumentsProvider opens a device just after device is
connected to Android. But MtpDocumentsProvider should open MTP device on
demand so that other applications can open device if user starts to use
the application before using MtpDocumentsProvider.

BUG=26625708

Change-Id: I6083b8c7cef49ee6e9fb0d15ca4adc129734f3eb

8 years agoMove logic to skip single storage.
Daichi Hirono [Tue, 2 Feb 2016 07:35:03 +0000 (16:35 +0900)]
Move logic to skip single storage.

The tree structure of MTP model looks like /device/storage/objects. But
almost all MTP device has only single storage, so it's redundant to show
a single storage as a child of device in UI.

MtpDocumentsProvider has a special logic to skip single storage, and
shows storage's object as a children of device in such case. Previously
the logic was applied when MtpDocumentsProvider returned a root
list. The provider returns a storage as a Documents.Root, instead of
device if the device has only one storage.

However the number of root cannot be obtain for closed device. Thus the
previous logic did not work for closed devices that have a single
storage. The CL moves the logic from queryRoot to
queryChildDocuments. Now MtpDocumentsProvider always returns a device as
root, then it returns storage's objects as the device's children, where
we has already opened the device.

BUG=26481574

Change-Id: I25af0fc220410e321a378d67f226798ec4bba19c

8 years agoMerge "AAPT2: Support -c configuration filtering"
Adam Lesinski [Wed, 3 Feb 2016 01:05:32 +0000 (01:05 +0000)]
Merge "AAPT2: Support -c configuration filtering"

8 years agoAAPT2: Support -c configuration filtering
Adam Lesinski [Wed, 3 Feb 2016 01:02:58 +0000 (17:02 -0800)]
AAPT2: Support -c configuration filtering

Change-Id: I1e5855ca73440bdc30c21bcbc1dfdd31a9842363

8 years agoMerge "Show view mode button in action bar on Downloads."
Steve McKay [Wed, 3 Feb 2016 00:48:15 +0000 (00:48 +0000)]
Merge "Show view mode button in action bar on Downloads."

8 years agoMerge "Fix null offscreen buffer crash"
Chris Craik [Wed, 3 Feb 2016 00:42:30 +0000 (00:42 +0000)]
Merge "Fix null offscreen buffer crash"

8 years agoMerge "Allow specifying stack when starting activity in AM command."
Filip Gruszczynski [Wed, 3 Feb 2016 00:27:59 +0000 (00:27 +0000)]
Merge "Allow specifying stack when starting activity in AM command."

8 years agoAllow specifying stack when starting activity in AM command.
Filip Gruszczynski [Tue, 2 Feb 2016 23:07:15 +0000 (15:07 -0800)]
Allow specifying stack when starting activity in AM command.

Change-Id: I42032bdebf16b6cd2c0c87fd9aa5c261bc9fe25d

8 years agoMerge "VectorDrawable native rendering - Step 4 of MANY"
Doris Liu [Wed, 3 Feb 2016 00:19:22 +0000 (00:19 +0000)]
Merge "VectorDrawable native rendering - Step 4 of MANY"

8 years agoMerge "Animate pinned stack resize when launching acivity with new bounds."
Filip Gruszczynski [Wed, 3 Feb 2016 00:16:05 +0000 (00:16 +0000)]
Merge "Animate pinned stack resize when launching acivity with new bounds."

8 years agoFix null offscreen buffer crash
Chris Craik [Wed, 3 Feb 2016 00:10:32 +0000 (16:10 -0800)]
Fix null offscreen buffer crash

bug:26571145

Change-Id: I6e885fd6135c0987360275cbf5b46475c24401d4

8 years agoUpdate RILConstants errors to match ril.h
Nathan Harold [Wed, 3 Feb 2016 00:09:12 +0000 (00:09 +0000)]
Update RILConstants errors to match ril.h
am: c0e87a55f2

* commit 'c0e87a55f2e07613e45ee8681498528f9fa7c752':
  Update RILConstants errors to match ril.h

8 years agoMerge "Created a ACTION_RESTRICT_BACKGROUND_CHANGED intent."
Felipe Leme [Tue, 2 Feb 2016 23:59:30 +0000 (23:59 +0000)]
Merge "Created a ACTION_RESTRICT_BACKGROUND_CHANGED intent."

8 years agoMerge "Added onMultiWindowChanged and onPictureInPictureChanged methods to Fragement...
Wale Ogunwale [Tue, 2 Feb 2016 23:53:47 +0000 (23:53 +0000)]
Merge "Added onMultiWindowChanged and onPictureInPictureChanged methods to Fragement class"

8 years agoMerge "Add tests for action bar's search icon behavior - Icon hidden when root...
Aga Wronska [Tue, 2 Feb 2016 23:46:12 +0000 (23:46 +0000)]
Merge "Add tests for action bar's search icon behavior     - Icon hidden when root doesn't support search     - Icon visible whan root supports search"

8 years agoAdded onMultiWindowChanged and onPictureInPictureChanged methods to Fragement class
Wale Ogunwale [Sat, 30 Jan 2016 05:13:50 +0000 (21:13 -0800)]
Added onMultiWindowChanged and onPictureInPictureChanged methods to Fragement class

Bug: 26688489
Change-Id: I611444b29199b4686c9f78dbdd33c9b71820aec4

8 years agoMerge "Condionally remove the block map file."
Tao Bao [Tue, 2 Feb 2016 23:41:08 +0000 (23:41 +0000)]
Merge "Condionally remove the block map file."

8 years agoMerge "Don't clear mExiting if window is going to be removed."
Chong Zhang [Tue, 2 Feb 2016 23:31:38 +0000 (23:31 +0000)]
Merge "Don't clear mExiting if window is going to be removed."

8 years agoAnimate pinned stack resize when launching acivity with new bounds.
Filip Gruszczynski [Tue, 2 Feb 2016 19:52:13 +0000 (11:52 -0800)]
Animate pinned stack resize when launching acivity with new bounds.

Bug: 25672053
Change-Id: Idbcbb77c2442d5e35041f757489f0657daad48c9

8 years agoMerge "Camera2: Legacy: fix legacy device CTS failures"
Yin-Chia Yeh [Tue, 2 Feb 2016 23:23:35 +0000 (23:23 +0000)]
Merge "Camera2: Legacy: fix legacy device CTS failures"

8 years agoMerge "Don't extend alert windows onto status bar/nav bar."
Filip Gruszczynski [Tue, 2 Feb 2016 23:11:39 +0000 (23:11 +0000)]
Merge "Don't extend alert windows onto status bar/nav bar."

8 years agoVectorDrawable native rendering - Step 4 of MANY
Doris Liu [Thu, 7 Jan 2016 21:49:26 +0000 (13:49 -0800)]
VectorDrawable native rendering - Step 4 of MANY

This CL runs VectorDrawable animation on RenderThread. The changes in this CL
include:
- Convert all the animators in AnimatorSet for AVD into a set of RenderNodeAnimators.
- Hook up the new animators with RenderThread
- Add drawOp in RecordingCanvas for drawing VD so that during the animation
  on RenderThread, all the property changes on VD can be reflected on the screen.

TODO:
- Implement reverse and reset for AVD.

Change-Id: I2df1d754f2db0ad098d9c15dde4bb2bdfafc2315

8 years agoRevert "Permissions: Get rid of GET_ACCOUNTS"
Carlos Valdivia [Tue, 2 Feb 2016 20:20:42 +0000 (20:20 +0000)]
Revert "Permissions: Get rid of GET_ACCOUNTS"

This reverts commit 918c55a67c2bf0cec79f75dec6ca468e914a5fd1.

Change-Id: I995f134336bf61ac1f21052355900ae89d0d6694

8 years agoMerge "DO / PO Shouldn't be removed as active admin..."
Makoto Onuki [Tue, 2 Feb 2016 22:55:48 +0000 (22:55 +0000)]
Merge "DO / PO Shouldn't be removed as active admin..."

8 years agoMerge "RTL for NotificationHeader now working correctly."
Selim Cinek [Tue, 2 Feb 2016 22:54:15 +0000 (22:54 +0000)]
Merge "RTL for NotificationHeader now working correctly."

8 years agoDO / PO Shouldn't be removed as active admin...
Makoto Onuki [Thu, 28 Jan 2016 22:44:18 +0000 (14:44 -0800)]
DO / PO Shouldn't be removed as active admin...

even if they asked.

Also clear(Device|Profile)Owner should remove them as the active admin
too.

Also add some more unit tests.

Bug 26858840

Change-Id: I7b3ed92e1b4cbe803381ed6e3f64d8de17b2ebb0

8 years agoShow view mode button in action bar on Downloads.
Steve McKay [Tue, 2 Feb 2016 19:41:03 +0000 (11:41 -0800)]
Show view mode button in action bar on Downloads.

A grab bag also with:
Report Roots while loading (in DEBUG).
Null check DirectoryFragment before calling methods on it.

Bug:26936660,26143397
Change-Id: Ief2c943eb24fb14349bbd9cc4a5fbd670f57d567

8 years agoAdd strings/setting for carrier app install dialog.
Junda Liu [Wed, 20 Jan 2016 07:20:15 +0000 (23:20 -0800)]
Add strings/setting for carrier app install dialog.

Bug: b/22863855
Change-Id: I34e2ff5997e14afe70a64edb055dc876e26d7946

8 years agoMerge "Remove check for missing parent calls"
Hall Liu [Tue, 2 Feb 2016 22:32:58 +0000 (22:32 +0000)]
Merge "Remove check for missing parent calls"

8 years agoDon't clear mExiting if window is going to be removed.
Chong Zhang [Tue, 2 Feb 2016 22:13:48 +0000 (14:13 -0800)]
Don't clear mExiting if window is going to be removed.

bug: 26819496
Change-Id: I7ab1f45f8d32bc086ded579b46b6b5e9b32771a0

8 years agoMerge "Fix activity thread."
Michael Lentine [Tue, 2 Feb 2016 21:57:20 +0000 (21:57 +0000)]
Merge "Fix activity thread."

8 years agoMerge "Add APIs to allow detection of encryption type"
Paul Lawrence [Tue, 2 Feb 2016 21:54:03 +0000 (21:54 +0000)]
Merge "Add APIs to allow detection of encryption type"

8 years agoUpdate RILConstants errors to match ril.h
Nathan Harold [Tue, 2 Feb 2016 21:22:19 +0000 (13:22 -0800)]
Update RILConstants errors to match ril.h

-Mirror changes from I997da9a15225716786c53b7457b498d4628e76be
-Add an error code for rate-limited requests

Bug: 26767732
Change-Id: Ic094fdf39d33a702e1799e099c86af5238deb226

8 years agoMerge "Refactor key handling and selection."
Ben Kwa [Tue, 2 Feb 2016 21:36:39 +0000 (21:36 +0000)]
Merge "Refactor key handling and selection."

8 years agoMerge "Start the sync job service after primary boot"
Chris Tate [Tue, 2 Feb 2016 21:34:39 +0000 (21:34 +0000)]
Merge "Start the sync job service after primary boot"

8 years agoMerge "Add a config file for linting."
Ben Kwa [Tue, 2 Feb 2016 21:17:18 +0000 (21:17 +0000)]
Merge "Add a config file for linting."

8 years agoStart the sync job service after primary boot
Christopher Tate [Tue, 2 Feb 2016 20:46:18 +0000 (12:46 -0800)]
Start the sync job service after primary boot

This avoids starting the "timeout?" clock until the system's main looper
thread is ready to actually process service startup, avoiding spurious
ANR reports.

Bug 26922408

Change-Id: I8fd3f20e4af644a933f1318e623096b73c7e8e08

8 years agoMerge "Don't require apps to call showLights to use default lights."
Julia Reynolds [Tue, 2 Feb 2016 20:43:28 +0000 (20:43 +0000)]
Merge "Don't require apps to call showLights to use default lights."

8 years agoMerge changes Idedf0045,Iae107a1b,Id798cc39
Winson Chung [Tue, 2 Feb 2016 20:28:14 +0000 (20:28 +0000)]
Merge changes Idedf0045,Iae107a1b,Id798cc39

* changes:
  Tweaking enter from/exit to home animations.
  Allow animation controls for each animated property.
  Fixing regression in animation of drag task.

8 years agoTweaking enter from/exit to home animations.
Winson [Tue, 2 Feb 2016 02:04:59 +0000 (18:04 -0800)]
Tweaking enter from/exit to home animations.

Change-Id: Idedf00457055b6f0268c0f93a0a14c6a553e1168

8 years agoAllow animation controls for each animated property.
Winson [Mon, 1 Feb 2016 22:27:52 +0000 (14:27 -0800)]
Allow animation controls for each animated property.

- Using onDrawForeground() instead of dispatchDraw()

Change-Id: Iae107a1ba14250f8c496264c60a29edc76df88e2

8 years agoFixing regression in animation of drag task.
Winson [Mon, 1 Feb 2016 22:05:29 +0000 (14:05 -0800)]
Fixing regression in animation of drag task.

- Should be ignoring the drag task, caused by a bad merge in ag/854463.
- Preventing relayout when picking up a new task view.  This issue
  caused the task view to be relaid out mid-drag if the animation in the
  stack causes a new TaskView to be picked up from the pool (ie. when
  dragging immediately after starting recents from scratch)

Change-Id: Id798cc39216d7ccbaa106c687aa0a518e7d5155f

8 years agoDon't require apps to call showLights to use default lights.
Julia Reynolds [Tue, 2 Feb 2016 20:11:59 +0000 (15:11 -0500)]
Don't require apps to call showLights to use default lights.

Bug: 26810573
Change-Id: I431a1a18e32c616238e763b401b5f6b14131fd89

8 years agoMerge "Allowing querying for apps with blocked topics."
Julia Reynolds [Tue, 2 Feb 2016 19:44:55 +0000 (19:44 +0000)]
Merge "Allowing querying for apps with blocked topics."

8 years agoMerge "Call SecurityLog methods via Injector"
Rubin Xu [Tue, 2 Feb 2016 19:42:12 +0000 (19:42 +0000)]
Merge "Call SecurityLog methods via Injector"

8 years agoMerge "Revert "TIF: Improve android.media.tv.TvContract.Programs.Genres#decode""
Chulwoo Lee [Tue, 2 Feb 2016 18:54:48 +0000 (18:54 +0000)]
Merge "Revert "TIF: Improve android.media.tv.TvContract.Programs.Genres#decode""

8 years agoRevert "TIF: Improve android.media.tv.TvContract.Programs.Genres#decode"
Chulwoo Lee [Tue, 2 Feb 2016 18:34:58 +0000 (18:34 +0000)]
Revert "TIF: Improve android.media.tv.TvContract.Programs.Genres#decode"

This reverts commit a6130cee3ac9ed8648be005adcf217cf4426defc.

Change-Id: Id3d5ec0ca35bbd8e0b28b2b0dd936078b5da93d6

8 years agoRefactor key handling and selection.
Ben Kwa [Wed, 27 Jan 2016 17:58:36 +0000 (09:58 -0800)]
Refactor key handling and selection.

- Pull key handling code out of the MultiSelectManager.

- Tighten up the semantics around range selection:
  - Create an API on MultiSelectManager for handling multi-select.
  - Make the range selection more opinionated (e.g. more state checks),
    to simplify the design and code.

BUG=25195767

Change-Id: I4bbe446ed3059150499db3d28e581b2e68405266

8 years agoMerge "Make AccessibilityGestureDetector handle gesture detection start and end."
Zach Kuznia [Tue, 2 Feb 2016 18:31:35 +0000 (18:31 +0000)]
Merge "Make AccessibilityGestureDetector handle gesture detection start and end."

8 years agoImport translations. DO NOT MERGE am: 34affa2303 -s ours am: 39c8547b5e -s ours
Geoff Mendal [Tue, 2 Feb 2016 18:25:49 +0000 (18:25 +0000)]
Import translations. DO NOT MERGE am: 34affa2303  -s ours am: 39c8547b5e  -s ours
am: 556931fe58  -s ours

* commit '556931fe58b57895d351ddeea8355cfdbc1ae669':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: 34affa2303 -s ours
Geoff Mendal [Tue, 2 Feb 2016 18:19:18 +0000 (18:19 +0000)]
Import translations. DO NOT MERGE am: 34affa2303  -s ours
am: 39c8547b5e  -s ours

* commit '39c8547b5ebb9cfa7a05e788f43eaa77d9de1241':
  Import translations. DO NOT MERGE

8 years agoMerge "Add API in TelecomService to manage blocked numbers."
Abhijith Shastry [Tue, 2 Feb 2016 18:19:06 +0000 (18:19 +0000)]
Merge "Add API in TelecomService to manage blocked numbers."

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 18:16:26 +0000 (18:16 +0000)]
Import translations. DO NOT MERGE
am: 34affa2303  -s ours

* commit '34affa2303e959275eb66d91e2a416d7a69fc520':
  Import translations. DO NOT MERGE

8 years agoMerge "Transfer focus from the current focused window for two-finger scroll"
Chong Zhang [Tue, 2 Feb 2016 18:10:18 +0000 (18:10 +0000)]
Merge "Transfer focus from the current focused window for two-finger scroll"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 18:09:58 +0000 (10:09 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 26887781
Change-Id: I2f77e533633815badf267419addb9d5f7686a200

8 years agoMerge "Fix breakage due to incomplete name change."
Anna Galusza [Tue, 2 Feb 2016 18:09:21 +0000 (18:09 +0000)]
Merge "Fix breakage due to incomplete name change."

8 years agoAdd a config file for linting.
Ben Kwa [Tue, 2 Feb 2016 18:07:15 +0000 (10:07 -0800)]
Add a config file for linting.

Change-Id: Ic76e8ea1cd2277c2cc1cf9588410bc142378f8a0

8 years agoFix breakage due to incomplete name change.
Anna Galusza [Tue, 2 Feb 2016 18:06:05 +0000 (10:06 -0800)]
Fix breakage due to incomplete name change.

Change-Id: Ief02bd4a994a4ff3a571fedfead05c732043500d

8 years agoMerge "Pinning components in ChooserActivity, take 2"
Adam Powell [Tue, 2 Feb 2016 18:02:17 +0000 (18:02 +0000)]
Merge "Pinning components in ChooserActivity, take 2"

8 years agoCall SecurityLog methods via Injector
Rubin Xu [Tue, 2 Feb 2016 18:00:28 +0000 (18:00 +0000)]
Call SecurityLog methods via Injector

This is to make sure the unit test can mock them out.

Bug: 26911599
Change-Id: I07a1a8b43ad5716a4b667bc5266b3b03997268c5

8 years agoAllowing querying for apps with blocked topics.
Julia Reynolds [Tue, 2 Feb 2016 15:24:30 +0000 (10:24 -0500)]
Allowing querying for apps with blocked topics.

Bug: 26882239
Change-Id: If888cb18891a412067bcb28e575f502c6091f77a

8 years agoMerge "Add new telephony disconnect cause for video calls when tty enabled." into...
Tyler Gunn [Tue, 2 Feb 2016 17:46:46 +0000 (17:46 +0000)]
Merge "Add new telephony disconnect cause for video calls when tty enabled." into mm-wireless-dev
am: 8562fb281c

* commit '8562fb281c37656d9198e6890f5c10e3541f6167':
  Add new telephony disconnect cause for video calls when tty enabled.

8 years agoMerge "Add new telephony disconnect cause for video calls when tty enabled." into...
Tyler Gunn [Tue, 2 Feb 2016 17:42:39 +0000 (17:42 +0000)]
Merge "Add new telephony disconnect cause for video calls when tty enabled." into mm-wireless-dev

8 years agoMerge "Allow the drawer to not be shown."
Anna Galusza [Tue, 2 Feb 2016 17:36:37 +0000 (17:36 +0000)]
Merge "Allow the drawer to not be shown."

8 years agoMerge "Decouple SD card from ADVANCED storage toggle."
Steve McKay [Tue, 2 Feb 2016 17:29:04 +0000 (17:29 +0000)]
Merge "Decouple SD card from ADVANCED storage toggle."

8 years agoDecouple SD card from ADVANCED storage toggle.
Steve McKay [Sat, 30 Jan 2016 02:15:39 +0000 (18:15 -0800)]
Decouple SD card from ADVANCED storage toggle.

A variety of related fixes:
- don't force size enable when browsing from device mounted notifications.
- don't show settings menu item as action (put in overflow).
- add sd card icon (not quite yet used, need to suss that out).

Bug:26880985,26883578,26771127
Change-Id: I36f153c42217f8092f157ded2a756c02525593ab

8 years agoPinning components in ChooserActivity, take 2
Adam Powell [Fri, 29 Jan 2016 18:21:00 +0000 (10:21 -0800)]
Pinning components in ChooserActivity, take 2

Keep the ChooserActivity in the android:ui process/system.

Change-Id: Ia3ae29a8d629f41a53a066b9fc7ed0b28666b261

8 years agoMerge "Also search in description when filtering printers."
Philip P. Moltmann [Tue, 2 Feb 2016 16:36:36 +0000 (16:36 +0000)]
Merge "Also search in description when filtering printers."

8 years agoMerge "Allow the PDF Printer to "print" non-locale-default paper sizes."
Philip P. Moltmann [Tue, 2 Feb 2016 16:34:49 +0000 (16:34 +0000)]
Merge "Allow the PDF Printer to "print" non-locale-default paper sizes."

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: ef9f2cbc84 -s ours...
Geoff Mendal [Tue, 2 Feb 2016 16:29:40 +0000 (16:29 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: ef9f2cbc84  -s ours am: 2335415569  -s ours
am: 1fa556d558  -s ours

* commit '1fa556d5581b9d2ce316099634dce272737602a9':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: 3dab749b31 -s ours am: 21890da2d8 -s ours
Geoff Mendal [Tue, 2 Feb 2016 16:26:10 +0000 (16:26 +0000)]
Import translations. DO NOT MERGE am: 3dab749b31  -s ours am: 21890da2d8  -s ours
am: 3fc87906b7  -s ours

* commit '3fc87906b76c3aabe0e09f21db65d56ccb4f235a':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: ef9f2cbc84 -s ours
Geoff Mendal [Tue, 2 Feb 2016 16:21:50 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: ef9f2cbc84  -s ours
am: 2335415569  -s ours

* commit '23354155699fb1638ae1c4d5d8600200123d6dc5':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: a0cf483a13 -s ours
Geoff Mendal [Tue, 2 Feb 2016 16:21:48 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: a0cf483a13  -s ours
am: c7a9540eaa  -s ours

* commit 'c7a9540eaa8e59ac98600c446278ed336285477a':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: 3dab749b31 -s ours
Geoff Mendal [Tue, 2 Feb 2016 16:20:17 +0000 (16:20 +0000)]
Import translations. DO NOT MERGE am: 3dab749b31  -s ours
am: 21890da2d8  -s ours

* commit '21890da2d808386ec7e8b322f8f033a0b63906d1':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: 1aa5b7517d -s ours
Geoff Mendal [Tue, 2 Feb 2016 16:19:45 +0000 (16:19 +0000)]
Import translations. DO NOT MERGE am: 1aa5b7517d  -s ours
am: 2eefc8f648  -s ours

* commit '2eefc8f6485603a0329a09b02ee0783a361677e5':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 16:16:48 +0000 (16:16 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: a0cf483a13  -s ours

* commit 'a0cf483a133ad4a0b8c680b1da196266be65150e':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 16:16:45 +0000 (16:16 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: ef9f2cbc84  -s ours

* commit 'ef9f2cbc843c580f6de12aed0a94aeeeadb85ac7':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:14:23 +0000 (16:14 +0000)]
Import translations. DO NOT MERGE
am: 1aa5b7517d  -s ours

* commit '1aa5b7517d55d1c9d43ad5474da238aa3c14a885':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:12:16 +0000 (16:12 +0000)]
Import translations. DO NOT MERGE
am: 3dab749b31  -s ours

* commit '3dab749b317485bbee345e08cebf91e9ac80b59d':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 16:09:01 +0000 (16:09 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 16:04:49 +0000 (16:04 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:03:45 +0000 (08:03 -0800)]
Import translations. DO NOT MERGE

Change-Id: I125fdf9cff416791a54d42450e6ef63ffec48a6f
Auto-generated-cl: translation import

8 years agoMerge "Frameworks/base: Add A/B OTA preopting"
Andreas Gampe [Tue, 2 Feb 2016 16:01:11 +0000 (16:01 +0000)]
Merge "Frameworks/base: Add A/B OTA preopting"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:00:13 +0000 (17:00 +0100)]
Import translations. DO NOT MERGE

Change-Id: If53700bcc5370eda1b87001b00f039a4d5fa016a
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 15:57:06 +0000 (07:57 -0800)]
Import translations. DO NOT MERGE

Change-Id: I491375fe7c3f4bafb6a310830c12cd1459072670
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 15:54:58 +0000 (16:54 +0100)]
Import translations. DO NOT MERGE

Change-Id: If918aa7c054de6b991dbce81ec459d7ca88dc71b
Auto-generated-cl: translation import

8 years agoMerge "Constrained allowable backup versions"
Ritesh Reddy [Tue, 2 Feb 2016 14:18:23 +0000 (14:18 +0000)]
Merge "Constrained allowable backup versions"

8 years agoMerge "Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f." am: 60cbd0b02b
Narayan Kamath [Tue, 2 Feb 2016 12:08:20 +0000 (12:08 +0000)]
Merge "Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f." am: 60cbd0b02b
am: 9572aae96e

* commit '9572aae96ed644c18a9f456856ad34714ee31aeb':
  Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f.

8 years agoMerge "Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f."
Narayan Kamath [Tue, 2 Feb 2016 12:03:53 +0000 (12:03 +0000)]
Merge "Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f."
am: 60cbd0b02b

* commit '60cbd0b02beb94b175e55d61bd64036a99029850':
  Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f.

8 years agoMerge "Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f."
Narayan Kamath [Tue, 2 Feb 2016 11:55:59 +0000 (11:55 +0000)]
Merge "Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f."

8 years agoMerge "Track libcore change f35c08530f77a744646e6e988d330a68f3af6940."
Narayan Kamath [Tue, 2 Feb 2016 11:55:34 +0000 (11:55 +0000)]
Merge "Track libcore change f35c08530f77a744646e6e988d330a68f3af6940."

8 years agoTrack libcore change f35c08530f77a744646e6e988d330a68f3af6940.
Narayan Kamath [Tue, 2 Feb 2016 11:54:01 +0000 (11:54 +0000)]
Track libcore change f35c08530f77a744646e6e988d330a68f3af6940.

Change-Id: I53bb912e7b7d6510952da8b121402628fa3f922d

8 years agoConstrained allowable backup versions
Ritesh Reddy [Tue, 2 Feb 2016 11:42:26 +0000 (11:42 +0000)]
Constrained allowable backup versions

Constrained the version on an incoming backup set
to the highest version that the SettingsBackupAgent
can handle. This is to deal with either corrupted backup
sets or newer backup sets (when modifiying/downgrading the
SettingsBackupAgent).

Change-Id: I4d666e8d4541c0b86e656a73744837d03318c4ae

8 years agoTrack libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f.
Narayan Kamath [Tue, 2 Feb 2016 11:40:12 +0000 (11:40 +0000)]
Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f.

Change-Id: Ib0e5efc903fe522fb2bc314b9000a26e90a4ea57

8 years agoMerge "Fix that can't launch managed QuickContact in ContactSearch"
Victor Chang [Tue, 2 Feb 2016 11:02:07 +0000 (11:02 +0000)]
Merge "Fix that can't launch managed QuickContact in ContactSearch"

8 years agoMerge "Mount appfuse in process namespace."
Daichi Hirono [Tue, 2 Feb 2016 10:14:27 +0000 (10:14 +0000)]
Merge "Mount appfuse in process namespace."

8 years agoMerge "Alarm: add missing closedir after opendir when searching for RTC" am: 21b2b7306e
Narayan Kamath [Tue, 2 Feb 2016 09:41:12 +0000 (09:41 +0000)]
Merge "Alarm: add missing closedir after opendir when searching for RTC" am: 21b2b7306e
am: 7b33488e12

* commit '7b33488e124bbe2a9fcfa6cd7a78726bc932ac8b':
  Alarm: add missing closedir after opendir when searching for RTC

8 years agoMerge "Alarm: add missing closedir after opendir when searching for RTC"
Narayan Kamath [Tue, 2 Feb 2016 09:36:55 +0000 (09:36 +0000)]
Merge "Alarm: add missing closedir after opendir when searching for RTC"
am: 21b2b7306e

* commit '21b2b7306e7d0612cdcb90eaa8102b6a7fa3f130':
  Alarm: add missing closedir after opendir when searching for RTC

8 years agoMerge "Alarm: add missing closedir after opendir when searching for RTC"
Narayan Kamath [Tue, 2 Feb 2016 09:31:04 +0000 (09:31 +0000)]
Merge "Alarm: add missing closedir after opendir when searching for RTC"

8 years agoAlarm: add missing closedir after opendir when searching for RTC
Mykola Kondratenko [Mon, 18 Jan 2016 11:43:30 +0000 (12:43 +0100)]
Alarm: add missing closedir after opendir when searching for RTC

It is mandatory that closedir() is called to deallocate DIR structure
allocated by opendir().

Fix degrade introduced by Google commit 0eb58268.

Change-Id: Ia12154f7f822153b4fc8e6bfb8b2bae17bc45c1a