OSDN Git Service

android-x86/frameworks-base.git
9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 17:02:14 +0000 (17:02 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 17:00:00 +0000 (10:00 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 14:35:58 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 14:33:21 +0000 (07:33 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 14:18:39 +0000 (07:18 -0700)]
Import translations. DO NOT MERGE

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

9 years agoFix: Selection handles are wrongly shown.
Keisuke Kuroyanagi [Wed, 22 Apr 2015 12:27:08 +0000 (21:27 +0900)]
Fix: Selection handles are wrongly shown.

Selection handles were always shown when selection action
mode is started at first time. When the action mode is
started without a selection, only insertion handle must be
shown.

Bug: 20264980
Bug: 20407551

Change-Id: I630804e007f795d28f87e3fa6cba0de5bf588c78

9 years agoam 41df3b4b: am ab52769b: am 789c5971: (-s ours) Merge "docs: Added What\'s New secti...
Quddus Chong [Mon, 27 Apr 2015 08:16:18 +0000 (08:16 +0000)]
am 41df3b4b: am ab52769b: am 789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs

* commit '41df3b4b4f3601567003cbbc742dbb748b4f01fe':

9 years agoam 0233b9aa: am 4f50a2b1: am 33ac358a: docs: Add Wear Capability training
Luan Nguyen [Mon, 27 Apr 2015 08:16:13 +0000 (08:16 +0000)]
am 0233b9aa: am 4f50a2b1: am 33ac358a: docs: Add Wear Capability training

* commit '0233b9aa462ac42a8dec3b61d4168d9e64ca93e1':

9 years agoam bcfee811: am bed3f49b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear...
Luan Nguyen [Mon, 27 Apr 2015 08:16:07 +0000 (08:16 +0000)]
am bcfee811: am bed3f49b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs

* commit 'bcfee8112a386f06b94d319bf3e477c36766e295':

9 years agoam c141efed: am 9c8f8117: am 900831f3: docs: Added 3rd-party Javadocs for Android...
Quddus Chong [Mon, 27 Apr 2015 08:16:01 +0000 (08:16 +0000)]
am c141efed: am 9c8f8117: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402

* commit 'c141efed1b6edc496c65a056264748cee102f2d9':

9 years agoam ed6c8ff1: am 3cd98ab6: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribu...
Ryosuke Matsuuchi [Mon, 27 Apr 2015 08:15:55 +0000 (08:15 +0000)]
am ed6c8ff1: am 3cd98ab6: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs

* commit 'ed6c8ff17f61b547f4f2a85776e514f8ab5a5241':

9 years agoam 7f2bdf88: am d668578f: am ff233af7: Merge "Doc change: distribute landing page...
Dirk Dougherty [Mon, 27 Apr 2015 08:15:50 +0000 (08:15 +0000)]
am 7f2bdf88: am d668578f: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs

* commit '7f2bdf885d0b72fa6e4c21953d0a0ca5d53ebbd1':

9 years agoam 74c57402: am 03389e7e: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog...
Rich Slogar [Mon, 27 Apr 2015 08:15:43 +0000 (08:15 +0000)]
am 74c57402: am 03389e7e: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs

* commit '74c574027c409cd071476559de1a66515d7b8fa2':

9 years agoam 4b79a147: am 5fb293b2: am efe861a4: Merge "docs: hierarchyviewer updates" into...
Rich Slogar [Mon, 27 Apr 2015 08:15:37 +0000 (08:15 +0000)]
am 4b79a147: am 5fb293b2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs

* commit '4b79a1477db467561cf6af874eb1770f355a9a5b':

9 years agoam ab52769b: am 789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS...
Quddus Chong [Mon, 27 Apr 2015 07:49:29 +0000 (07:49 +0000)]
am ab52769b: am 789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs

* commit 'ab52769be2d2dc33a520459194f1e007f03970e4':

9 years agoam 4f50a2b1: am 33ac358a: docs: Add Wear Capability training
Luan Nguyen [Mon, 27 Apr 2015 07:49:23 +0000 (07:49 +0000)]
am 4f50a2b1: am 33ac358a: docs: Add Wear Capability training

* commit '4f50a2b173e31accd8f1fbdde7e9b038914746e7':

9 years agoam bed3f49b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp...
Luan Nguyen [Mon, 27 Apr 2015 07:49:16 +0000 (07:49 +0000)]
am bed3f49b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs

* commit 'bed3f49b5547642c76901d848c08163463ab4fbe':

9 years agoam 9c8f8117: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing...
Quddus Chong [Mon, 27 Apr 2015 07:49:10 +0000 (07:49 +0000)]
am 9c8f8117: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402

* commit '9c8f8117c1ed2fbf2181011116287b5f6c6dbe9d':

9 years agoam 3cd98ab6: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page...
Ryosuke Matsuuchi [Mon, 27 Apr 2015 07:49:03 +0000 (07:49 +0000)]
am 3cd98ab6: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs

* commit '3cd98ab63cf4bee489de9077e62c93a13f9e66b2':

9 years agoam d668578f: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
Dirk Dougherty [Mon, 27 Apr 2015 07:48:52 +0000 (07:48 +0000)]
am d668578f: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs

* commit 'd668578f6f7a5623bc88afa1e39bb19ede91879e':

9 years agoam 03389e7e: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp...
Rich Slogar [Mon, 27 Apr 2015 07:48:44 +0000 (07:48 +0000)]
am 03389e7e: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs

* commit '03389e7e4a74a92b6bcae5474e9b2c887ac2d335':

9 years agoam 5fb293b2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
Rich Slogar [Mon, 27 Apr 2015 07:48:37 +0000 (07:48 +0000)]
am 5fb293b2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs

* commit '5fb293b27d71cc1b8949179c30d43fc057ae05fb':

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 01:52:36 +0000 (01:52 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 01:47:08 +0000 (18:47 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 01:43:32 +0000 (01:43 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 01:32:53 +0000 (18:32 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 01:29:43 +0000 (18:29 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan...
Quddus Chong [Sun, 26 Apr 2015 22:00:29 +0000 (22:00 +0000)]
am 789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs

* commit '789c59711e55be981ed2093228ded0c588e74ba0':
  docs: Added What's New section for GMS v7.3 (Parmesan).

9 years agoam 33ac358a: docs: Add Wear Capability training
Luan Nguyen [Sun, 26 Apr 2015 19:15:52 +0000 (19:15 +0000)]
am 33ac358a: docs: Add Wear Capability training

* commit '33ac358a5a4199549d11ba1931243e7dc8a7ab85':
  docs: Add Wear Capability training

9 years agoam 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
Luan Nguyen [Sun, 26 Apr 2015 19:15:46 +0000 (19:15 +0000)]
am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs

* commit '4aebbfbb9ba54d77ac99508fb66db6c9fd24343a':
  docs: Add Channel API summary for Wear.

9 years agoam 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0...
Quddus Chong [Sun, 26 Apr 2015 19:15:39 +0000 (19:15 +0000)]
am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402

* commit '900831f303beb4a67a871d969ac822d8b6d36460':
  docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402

9 years agoam 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
Ryosuke Matsuuchi [Sun, 26 Apr 2015 19:15:26 +0000 (19:15 +0000)]
am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs

* commit '0d2f280310458d23618edf6550818f8f9cfa6b47':
  doc: Add Korean version of DAC/distribute/ page.

9 years agoam ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
Dirk Dougherty [Sun, 26 Apr 2015 19:15:20 +0000 (19:15 +0000)]
am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs

* commit 'ff233af75f2201c2724f8b388c39d3abeb8c6a2e':
  Doc change: distribute landing page.

9 years agoam 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
Rich Slogar [Sun, 26 Apr 2015 19:15:12 +0000 (19:15 +0000)]
am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs

* commit '1fcc6bd854f6e152cf8796a4a70965e350c3bdcf':
  docs: studio remove gradle tasks dialog

9 years agoam efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
Rich Slogar [Sun, 26 Apr 2015 19:15:04 +0000 (19:15 +0000)]
am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs

* commit 'efe861a4a7081da795fe6a0843308ca7cef26277':
  docs: hierarchyviewer updates

9 years agoam 2a8ef256: am 495227aa: Doc change: update dff image.
Dirk Dougherty [Sat, 25 Apr 2015 22:05:38 +0000 (22:05 +0000)]
am 2a8ef256: am 495227aa: Doc change: update dff image.

* commit '2a8ef2563042e2db93960ace529a2986c289d3dc':
  Doc change: update dff image.

9 years agoam 05ad674a: am 00e165ae: am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"
Nick Kralevich [Sat, 25 Apr 2015 22:05:25 +0000 (22:05 +0000)]
am 05ad674a: am 00e165ae: am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"

* commit '05ad674aa888e3f9217de0e5c3176161dd8e31aa':
  fix compiler error under FORTIFY_SOURCE=2

9 years agoam 495227aa: Doc change: update dff image.
Dirk Dougherty [Sat, 25 Apr 2015 21:59:35 +0000 (21:59 +0000)]
am 495227aa: Doc change: update dff image.

* commit '495227aab706fa6daf7f7b0b4ca741fef82c9d1d':
  Doc change: update dff image.

9 years agoam 00e165ae: am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"
Nick Kralevich [Sat, 25 Apr 2015 21:56:56 +0000 (21:56 +0000)]
am 00e165ae: am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"

* commit '00e165aed3d53b147b153003b3b9fd3c129ff3c4':
  fix compiler error under FORTIFY_SOURCE=2

9 years agoDoc change: update dff image.
Dirk Dougherty [Sat, 25 Apr 2015 21:49:40 +0000 (14:49 -0700)]
Doc change: update dff image.

Bug-id: 20251587

Change-Id: I25d59c8a66c548a13e699c25e79cd4a23d2cd330

9 years agoam e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"
Nick Kralevich [Sat, 25 Apr 2015 21:41:52 +0000 (21:41 +0000)]
am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"

* commit 'e8101c047cffc69245493d96f2f2ec36728682f1':
  fix compiler error under FORTIFY_SOURCE=2

9 years agoMerge "fix compiler error under FORTIFY_SOURCE=2"
Nick Kralevich [Sat, 25 Apr 2015 21:22:31 +0000 (21:22 +0000)]
Merge "fix compiler error under FORTIFY_SOURCE=2"

9 years agoMerge "Frameworks/base: Fix a constructor"
Andreas Gampe [Sat, 25 Apr 2015 20:16:09 +0000 (20:16 +0000)]
Merge "Frameworks/base: Fix a constructor"

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 25 Apr 2015 09:28:09 +0000 (09:28 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 25 Apr 2015 09:16:31 +0000 (09:16 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 25 Apr 2015 09:12:37 +0000 (09:12 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 25 Apr 2015 08:55:11 +0000 (01:55 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 25 Apr 2015 07:23:36 +0000 (00:23 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 25 Apr 2015 06:58:45 +0000 (23:58 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 25 Apr 2015 06:44:04 +0000 (23:44 -0700)]
Import translations. DO NOT MERGE

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

9 years agofix compiler error under FORTIFY_SOURCE=2
Nick Kralevich [Sat, 25 Apr 2015 03:25:50 +0000 (20:25 -0700)]
fix compiler error under FORTIFY_SOURCE=2

frameworks/base/libs/androidfw/ObbFile.cpp:340:5: error: ignoring return value of function declared with warn_unused_result attribute [-Werror,-Wunused-result]
    ftruncate(fd, mFooterStart);
    ^~~~~~~~~ ~~~~~~~~~~~~~~~~
1 error generated.
amake: *** [out/host/linux-x86/obj/STATIC_LIBRARIES/libandroidfw_intermediates/ObbFile.o] Error 1

Change-Id: I7080d64e7a830a10b41c1ebf33c60d32b7c8356e

9 years agoMerge "Improve the falsing logic for unlock motion"
Selim Cinek [Sat, 25 Apr 2015 02:12:51 +0000 (02:12 +0000)]
Merge "Improve the falsing logic for unlock motion"

9 years agoImprove the falsing logic for unlock motion
Selim Cinek [Sat, 25 Apr 2015 01:54:30 +0000 (18:54 -0700)]
Improve the falsing logic for unlock motion

Bug: 20563134
Change-Id: I628829915ad2cc7f1df5d0c971def44f6eacdae4

9 years agoMerge "Doc fix - incorrect format (included argument) for function reference."
Etan Cohen [Sat, 25 Apr 2015 01:44:26 +0000 (01:44 +0000)]
Merge "Doc fix - incorrect format (included argument) for function reference."

9 years agoDoc fix - incorrect format (included argument) for function reference.
Etan Cohen [Sat, 25 Apr 2015 01:43:41 +0000 (18:43 -0700)]
Doc fix - incorrect format (included argument) for function reference.

Change-Id: I2cdf7b4f078b1ab0556fcc3fad5287f86641c396

9 years agoMerge "Add hidden SensorManager APIs for injecting sensor data."
Aravind Akella [Sat, 25 Apr 2015 01:40:25 +0000 (01:40 +0000)]
Merge "Add hidden SensorManager APIs for injecting sensor data."

9 years agoMerge "Hide stretch mode from PlaybackSettings"
Andy Hung [Sat, 25 Apr 2015 01:28:41 +0000 (01:28 +0000)]
Merge "Hide stretch mode from PlaybackSettings"

9 years agoMerge "Properly mangle file names"
Adam Lesinski [Sat, 25 Apr 2015 01:20:59 +0000 (01:20 +0000)]
Merge "Properly mangle file names"

9 years agoMerge "Only skip unrecognized tags."
Julia Reynolds [Sat, 25 Apr 2015 01:09:24 +0000 (01:09 +0000)]
Merge "Only skip unrecognized tags."

9 years agoMerge "Fix documentation - non-public API."
Etan Cohen [Sat, 25 Apr 2015 01:08:10 +0000 (01:08 +0000)]
Merge "Fix documentation - non-public API."

9 years agoFix documentation - non-public API.
Etan Cohen [Sat, 25 Apr 2015 01:06:59 +0000 (18:06 -0700)]
Fix documentation - non-public API.

Change-Id: I418bf47b197936b2f50b231425312d5b6d272df8

9 years agoMerge "Migrate primary external storage."
Jeff Sharkey [Sat, 25 Apr 2015 01:03:06 +0000 (01:03 +0000)]
Merge "Migrate primary external storage."

9 years agoMigrate primary external storage.
Jeff Sharkey [Fri, 24 Apr 2015 23:10:32 +0000 (16:10 -0700)]
Migrate primary external storage.

Wire up through MountService to call down into vold.  Watch for
unsolicited events that report progress, including special value "82"
that signals that copy has finished.  We use this value to persist
the volumeUuid in case of unexpected reboot, since it indicates the
new volume is ready.

Wire progress updates through existing callback pipeline.

Update the volume mounting code to match against the persisted UUID
when selecting the primary external storage.

Bug: 19993667
Change-Id: Id46957610fb43517bbfbc368f29b7d430664590d

9 years agoMerge changes from topic 'mwd-merge-042415'
Etan Cohen [Sat, 25 Apr 2015 00:49:40 +0000 (00:49 +0000)]
Merge changes from topic 'mwd-merge-042415'

* changes:
  Rename removeVideoCallListener to unregisterCallback
  Bluetooth document fix: remove reference from open API to hidden entities
  Fix build due to merge of 7595842 and renaming due to 8eb87f0
  Merge commit '052a0da' into merge2
  Merge commit 'db1dbb8' into merge2
  Merge commit '7e5e791' into merge2
  Merge commit '170102d' into merge2
  Merge commit '4cb5d80' into merge2
  Merge commit '83cda00' into merge2
  Merge commit 'c91bc62' into merge2
  Merge commit 'cffc360' into merge2
  Merge commit '7f61051' into merge2
  Merge commit '167c3a7' into merge2
  Merge commit '4467b98' into merge2
  Merge commit '25a217c' into merge2
  Merge commit '04b18ec' into merge2
  Merge commit '7595842' into merge2
  Merge commit '2bbd2b6' into merge2
  Merge commit '4890351' into merge2
  Merge commit 'cd405fe' into merge2
  Merge commit '6ddbb5e' into merge2
  Merge commit 'de93575' into merge2
  Merge commit '9561e74' into merge2

9 years agoMerge "camera: Start/stop preview before clearing surface."
Ruben Brunk [Sat, 25 Apr 2015 00:48:25 +0000 (00:48 +0000)]
Merge "camera: Start/stop preview before clearing surface."

9 years agoHide stretch mode from PlaybackSettings
Andy Hung [Sat, 25 Apr 2015 00:32:57 +0000 (17:32 -0700)]
Hide stretch mode from PlaybackSettings

Different timestretch modes won't be ready for M.

Change-Id: I4fe5ceee5bdf90cb735eb415185812603b5c68a8

9 years agoMerge "Don't use a WeakReference for fingerprint notification object."
Jim Miller [Sat, 25 Apr 2015 00:25:53 +0000 (00:25 +0000)]
Merge "Don't use a WeakReference for fingerprint notification object."

9 years agoMerge "Smooth transitions between SHOW_WHEN_LOCKED activities"
Adrian Roos [Sat, 25 Apr 2015 00:18:21 +0000 (00:18 +0000)]
Merge "Smooth transitions between SHOW_WHEN_LOCKED activities"

9 years agoMerge "Move channel index computation to native AudioTrack JNI"
Andy Hung [Sat, 25 Apr 2015 00:18:12 +0000 (00:18 +0000)]
Merge "Move channel index computation to native AudioTrack JNI"

9 years agoSmooth transitions between SHOW_WHEN_LOCKED activities
Adrian Roos [Fri, 24 Apr 2015 23:03:47 +0000 (16:03 -0700)]
Smooth transitions between SHOW_WHEN_LOCKED activities

Bug: 12536117
Change-Id: Ia5f96e49587661440ae31fba17c42b2e3a9557fb

9 years agoDon't use a WeakReference for fingerprint notification object.
Jim Miller [Fri, 24 Apr 2015 23:59:11 +0000 (16:59 -0700)]
Don't use a WeakReference for fingerprint notification object.

This was causing a problem where a GC in the system process
would inadvertently remove the callback.

Potential fix for bug 20491119

Change-Id: I9d7d0bb8e29fcd6c52cb3be645bbb9c8e5413d48

9 years agoam 6c52d51c: am bbe5effb: docs: Fixed typo in \'Authorizing with Google for REST...
Quddus Chong [Fri, 24 Apr 2015 23:53:59 +0000 (23:53 +0000)]
am 6c52d51c: am bbe5effb: docs: Fixed typo in \'Authorizing with Google for REST APIs\' doc. bug: 18025533

* commit '6c52d51c65613beb23ea135e8a8374f6c2dc1bf8':
  docs: Fixed typo in 'Authorizing with Google for REST APIs' doc. bug: 18025533

9 years agoMerge "Remove problematic early return from notifyDataSetChanged"
Adam Cohen [Fri, 24 Apr 2015 23:43:48 +0000 (23:43 +0000)]
Merge "Remove problematic early return from notifyDataSetChanged"

9 years agoMerge "Fix stale inKeyguardInputRestrictedMode"
Adrian Roos [Fri, 24 Apr 2015 23:43:34 +0000 (23:43 +0000)]
Merge "Fix stale inKeyguardInputRestrictedMode"

9 years agoam bbe5effb: docs: Fixed typo in \'Authorizing with Google for REST APIs\' doc. bug...
Quddus Chong [Fri, 24 Apr 2015 23:43:49 +0000 (23:43 +0000)]
am bbe5effb: docs: Fixed typo in \'Authorizing with Google for REST APIs\' doc. bug: 18025533

* commit 'bbe5effb6682b4ba5e6accd9a226ec7611fe83dc':
  docs: Fixed typo in 'Authorizing with Google for REST APIs' doc. bug: 18025533

9 years agoMerge "Unhide new channel masks and deprecate old channel masks"
Andy Hung [Fri, 24 Apr 2015 23:43:32 +0000 (23:43 +0000)]
Merge "Unhide new channel masks and deprecate old channel masks"

9 years agoMerge "TIF: Add TvContentRating constant for unrated content"
Jae Seo [Fri, 24 Apr 2015 23:41:19 +0000 (23:41 +0000)]
Merge "TIF: Add TvContentRating constant for unrated content"

9 years agoMerge "More usage tracking"
Amith Yamasani [Fri, 24 Apr 2015 23:39:32 +0000 (23:39 +0000)]
Merge "More usage tracking"

9 years agoMerge "Add AudioManager property strings for ultrasound."
Arunesh Mishra [Fri, 24 Apr 2015 23:29:38 +0000 (23:29 +0000)]
Merge "Add AudioManager property strings for ultrasound."

9 years agodocs: Fixed typo in 'Authorizing with Google for REST APIs' doc.
Quddus Chong [Fri, 24 Apr 2015 23:28:40 +0000 (16:28 -0700)]
docs: Fixed typo in 'Authorizing with Google for REST APIs' doc.
bug: 18025533

Change-Id: I6379b2a7be495a506e0e428fe9c68fdbe197704b

9 years agoRemove problematic early return from notifyDataSetChanged
Adam Cohen [Fri, 24 Apr 2015 22:39:45 +0000 (15:39 -0700)]
Remove problematic early return from notifyDataSetChanged

-> If connection to the service fails for whatever reason,
mNotifyDataSetChangedAfterOnServiceConnected can get stuck to true, preventing
future connections to the service. Don't let this prevent from connecting to the
service.

issue 19890339

Change-Id: I376101ae146359109df53add3a3202ba2e1e842d

9 years agoMore usage tracking
Amith Yamasani [Fri, 17 Apr 2015 17:02:15 +0000 (10:02 -0700)]
More usage tracking

Notification listeners can now report that a notification
has been seen by the user and that package is then marked
as active.

Bug: 20066058
Change-Id: I336040a52c44c21fd0d78b02ec9a19d448c64b40

9 years agoMerge "Add APIs to getDefaultDialerPackage and getSystemDialerPackage"
Yorke Lee [Fri, 24 Apr 2015 23:11:41 +0000 (23:11 +0000)]
Merge "Add APIs to getDefaultDialerPackage and getSystemDialerPackage"

9 years agoMove channel index computation to native AudioTrack JNI
Andy Hung [Fri, 24 Apr 2015 02:28:38 +0000 (19:28 -0700)]
Move channel index computation to native AudioTrack JNI

Change-Id: I047a9dcce13a38c11da165607d668dfb9d7fa335

9 years agoFix stale inKeyguardInputRestrictedMode
Adrian Roos [Fri, 24 Apr 2015 23:04:53 +0000 (16:04 -0700)]
Fix stale inKeyguardInputRestrictedMode

Bug: 20536027
Change-Id: Ica65b388ae2c58a45c66e9f30efa3fadeded8d47

9 years agoMerge "Remove distance based animation duration API"
Doris Liu [Fri, 24 Apr 2015 23:04:59 +0000 (23:04 +0000)]
Merge "Remove distance based animation duration API"

9 years agoMerge "Added SystemServiceRegistry to preloaded-classes"
Fyodor Kupolov [Fri, 24 Apr 2015 23:02:41 +0000 (23:02 +0000)]
Merge "Added SystemServiceRegistry to preloaded-classes"

9 years agoMerge "Notify IME visibility when showWindow is called."
Seigo Nonaka [Fri, 24 Apr 2015 22:46:12 +0000 (22:46 +0000)]
Merge "Notify IME visibility when showWindow is called."

9 years agoMerge "Image: fix build break"
Zhijun He [Fri, 24 Apr 2015 22:38:46 +0000 (22:38 +0000)]
Merge "Image: fix build break"

9 years agoMerge "parcel: Add efficient methods for writing and reading a parcelable."
Jens Ole Lauridsen [Fri, 24 Apr 2015 22:37:45 +0000 (22:37 +0000)]
Merge "parcel: Add efficient methods for writing and reading a parcelable."

9 years agoam cc9c597d: am d639a453: am e60077e6: Merge "Revert "[ActivityManager] Improve multi...
Wale Ogunwale [Fri, 24 Apr 2015 22:35:34 +0000 (22:35 +0000)]
am cc9c597d: am d639a453: am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""

* commit 'cc9c597dad6d99242ed2903d8760922f66223401':
  Revert "[ActivityManager] Improve multi-thread access the same provider"

9 years agoam 4cdc7e84: am e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we have an...
Wale Ogunwale [Fri, 24 Apr 2015 22:35:26 +0000 (22:35 +0000)]
am 4cdc7e84: am e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""

* commit '4cdc7e842d8b1ff1e70d2a0b4a2a1939fa116563':
  Revert "Clean-up state if we have an exception when acquiring provider"

9 years agoImage: fix build break
Zhijun He [Fri, 24 Apr 2015 22:29:21 +0000 (15:29 -0700)]
Image: fix build break

Change-Id: I51e91a6c370626603f79371c16c8a10195ba63da

9 years agoam d639a453: am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread acces...
Wale Ogunwale [Fri, 24 Apr 2015 22:26:08 +0000 (22:26 +0000)]
am d639a453: am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""

* commit 'd639a4532417bf605f03b3b5efdb3a9e1cbe6661':
  Revert "[ActivityManager] Improve multi-thread access the same provider"

9 years agoam e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we have an exception when...
Wale Ogunwale [Fri, 24 Apr 2015 22:26:04 +0000 (22:26 +0000)]
am e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""

* commit 'e2047da6f3f21fc702d35b7d1c4e9bb62c963dac':
  Revert "Clean-up state if we have an exception when acquiring provider"

9 years agoRename removeVideoCallListener to unregisterCallback
Etan Cohen [Fri, 24 Apr 2015 22:16:10 +0000 (15:16 -0700)]
Rename removeVideoCallListener to unregisterCallback

Change-Id: Ie6b5ac9131e81900efc7d3fa67056aa47d566a44

9 years agoam e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same...
Wale Ogunwale [Fri, 24 Apr 2015 22:15:02 +0000 (22:15 +0000)]
am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""

* commit 'e60077e62a441dbcc132b2abb35d998ab48d261c':
  Revert "[ActivityManager] Improve multi-thread access the same provider"

9 years agoam d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring...
Wale Ogunwale [Fri, 24 Apr 2015 22:14:56 +0000 (22:14 +0000)]
am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""

* commit 'd9bf26522b930a8d5d25f6e28c390e39fee6d0b2':
  Revert "Clean-up state if we have an exception when acquiring provider"

9 years agoam 6c1af7ea: am 8652bce1: am c71f2648: Merge "frameworks/base: switch to using Native...
Kenny Root [Fri, 24 Apr 2015 22:13:26 +0000 (22:13 +0000)]
am 6c1af7ea: am 8652bce1: am c71f2648: Merge "frameworks/base: switch to using NativeConstants."

* commit '6c1af7ea497b1a2f04bdf45a19d2147f5b9665b9':
  frameworks/base: switch to using NativeConstants.

9 years agoMerge "TIF: Use Preconditions.checkNotNull for null checking"
Jae Seo [Fri, 24 Apr 2015 22:03:35 +0000 (22:03 +0000)]
Merge "TIF: Use Preconditions.checkNotNull for null checking"