OSDN Git Service
Tianjie Xu [Fri, 16 Sep 2016 18:36:20 +0000 (18:36 +0000)]
Merge "Collect status on uncrypt time cost" am:
bc19e00d35
am:
79d27bdeac
Change-Id: I64f13dbe40845eecb584c0f45a169e0c948275ab
Mark Lu [Fri, 16 Sep 2016 18:30:41 +0000 (18:30 +0000)]
Merge "[AM] Skip unnessary ANR when process already died." am:
831a4aea1e
am:
57341808f1
Change-Id: I95e71746ddf33247da1b81c9036b3f46d89f446e
Tianjie Xu [Fri, 16 Sep 2016 18:30:38 +0000 (18:30 +0000)]
Merge "Collect status on uncrypt time cost"
am:
bc19e00d35
Change-Id: I867821b7575ee2e45bb86c46222e6cf34971689d
Mark Lu [Fri, 16 Sep 2016 18:26:10 +0000 (18:26 +0000)]
Merge "[AM] Skip unnessary ANR when process already died."
am:
831a4aea1e
Change-Id: Ib8c0ffa8d50bb5a3fbc2d8f35274a8301494cd93
Tianjie Xu [Fri, 16 Sep 2016 18:19:22 +0000 (18:19 +0000)]
Merge "Collect status on uncrypt time cost"
Treehugger Robot [Fri, 16 Sep 2016 18:16:22 +0000 (18:16 +0000)]
Merge "[AM] Skip unnessary ANR when process already died."
Robert Sesek [Fri, 16 Sep 2016 17:44:33 +0000 (17:44 +0000)]
Merge "Move art::Runtime::InitZygote logic from art into frameworks/base." am:
9c08f6bb82
am:
9c24e04b9e
Change-Id: I0437c65d085069d0df33bdda48d08359cc482559
Robert Sesek [Fri, 16 Sep 2016 17:41:17 +0000 (17:41 +0000)]
Move art::Runtime::InitZygote logic from art into frameworks/base. am:
e4f8d69c58
am:
c1b32fc3ea
Change-Id: Ifae90057835b576ca001a141cb56aa4e4f9ba321
Robert Sesek [Fri, 16 Sep 2016 17:37:43 +0000 (17:37 +0000)]
Merge "Move art::Runtime::InitZygote logic from art into frameworks/base."
am:
9c08f6bb82
Change-Id: Ia58d4bb105e564437216b9e951b83e721f47c51d
Robert Sesek [Fri, 16 Sep 2016 17:32:49 +0000 (17:32 +0000)]
Move art::Runtime::InitZygote logic from art into frameworks/base.
am:
e4f8d69c58
Change-Id: Ia6fdf02ba9d7cd6e473d2891d5b8e59b4e967347
Treehugger Robot [Fri, 16 Sep 2016 17:23:41 +0000 (17:23 +0000)]
Merge "Move art::Runtime::InitZygote logic from art into frameworks/base."
Mark Lu [Wed, 23 Mar 2016 11:08:44 +0000 (19:08 +0800)]
[AM] Skip unnessary ANR when process already died.
When app process been killed by AMS or lowmemkiller just before ANR report,
because process record info has been cleared after received death recipient,
it also cannot dump trace log because process already dead,
so report ANR & show ANR UI to let user wait seems is unnecessary.
(compare normal ANR case, if kill app process by command,
ANR dialog will also dismissed, it seems reasonable.)
To check above condition, if ANR process record killed set as true,
it means process already dead & can skip report this ANR.
Change-Id: I483cb02bacb10c32db80ca1097310b02abbac24d
Elliott Hughes [Fri, 16 Sep 2016 08:50:08 +0000 (08:50 +0000)]
Merge "Stop including libcore/include/ in most of frameworks/base." am:
05884ac869
am:
21ba3d9527
Change-Id: I6d71b74ffb28cf564a9f21a9dd5d749f76d83210
Elliott Hughes [Fri, 16 Sep 2016 08:43:56 +0000 (08:43 +0000)]
Merge "Stop including libcore/include/ in most of frameworks/base."
am:
05884ac869
Change-Id: I4f919dc0bfcb4d9ecd65c61b304c01169ba3ce8a
Treehugger Robot [Fri, 16 Sep 2016 08:36:44 +0000 (08:36 +0000)]
Merge "Stop including libcore/include/ in most of frameworks/base."
Gopal Krishna Shukla [Fri, 16 Sep 2016 05:36:36 +0000 (05:36 +0000)]
Merge "Remove synchronization from getCurrentInputMethodSubtype()" am:
85539bed77
am:
d3e1e473df
Change-Id: Iad174757bbb77ce2eef4bd39fd218b64f6e35931
Gopal Krishna Shukla [Fri, 16 Sep 2016 05:31:29 +0000 (05:31 +0000)]
Merge "Remove synchronization from getCurrentInputMethodSubtype()"
am:
85539bed77
Change-Id: I0f564ebcb74d4c17a4d18ab2fe8660c977731590
Treehugger Robot [Fri, 16 Sep 2016 05:21:33 +0000 (05:21 +0000)]
Merge "Remove synchronization from getCurrentInputMethodSubtype()"
Gopal Krishna Shukla [Thu, 30 Jun 2016 06:04:21 +0000 (11:34 +0530)]
Remove synchronization from getCurrentInputMethodSubtype()
getCurrentInputMethodSubtype() acquires InputManagerService.mMethodMap
within its body. There seems to be no reason for holding
InputMethodManager.mH to call getCurrentInputMethodSubtype(). Holding mH
can cause potential deadlock b/w two threads acquiring mH and mMethodMap
in different orders.
Bug:
31247871
Bug:
31273203
Bug: b.android.com/218423
Change-Id: I20cf2c20f49b1b02c0f7a18257b49d4bcc081b5d
Elliott Hughes [Thu, 15 Sep 2016 20:13:39 +0000 (13:13 -0700)]
Stop including libcore/include/ in most of frameworks/base.
frameworks/base/core/jni/android_text_StaticLayout.cpp does actually use
ScopedIcuLocale, so I've left that for now.
Change-Id: I6458cd133871281a747a9da2e304da10b445051a
Dan Yu [Thu, 15 Sep 2016 16:22:15 +0000 (16:22 +0000)]
Merge "docs: Add docs on OnboardingFragment" into nyc-dev
am:
f3f6921b57
Change-Id: I5b327e628f8e4aede45b274416879177b8cb0cd7
Daniel Yu [Thu, 15 Sep 2016 16:22:11 +0000 (16:22 +0000)]
docs: Add docs on OnboardingFragment
am:
d64f8bfe1f
Change-Id: I35c76cc90613cee8ca23c1ea520fee2a27f59583
Dan Yu [Thu, 15 Sep 2016 16:13:18 +0000 (16:13 +0000)]
Merge "docs: Add docs on OnboardingFragment" into nyc-dev
Scott Main [Thu, 15 Sep 2016 03:43:39 +0000 (03:43 +0000)]
Merge "Revert "add dev guide for constraint layout."" into nyc-dev
am:
a688419378
Change-Id: I354587408dd304dd6a709420643cc48afd351a7a
Scott Main [Thu, 15 Sep 2016 03:43:34 +0000 (03:43 +0000)]
Revert "add dev guide for constraint layout."
am:
e6469e8211
Change-Id: I687e80b30301be15997cf1d2639cf3e7a135fb62
Scott Main [Thu, 15 Sep 2016 03:38:39 +0000 (03:38 +0000)]
Merge "Revert "add dev guide for constraint layout."" into nyc-dev
Scott Main [Thu, 15 Sep 2016 03:37:37 +0000 (03:37 +0000)]
Revert "add dev guide for constraint layout."
studio 2.2 launch delayed
This reverts commit
346f6d395ccf1196a289f4314d26aa026a2dbba5.
Change-Id: I61a555ed3f804dfdc4ef3e9a84e869154206639d
Hongming Jin [Wed, 14 Sep 2016 23:23:10 +0000 (23:23 +0000)]
Merge "Only return password for account session flow if the caller is signed with system key and have get_password permission." into nyc-dev
am:
0c04977949
Change-Id: I97506d9c1304b844d9ec6c375aa3594a25c255fc
Hongming Jin [Wed, 14 Sep 2016 23:23:05 +0000 (23:23 +0000)]
Only return password for account session flow if the caller is signed with system key and have get_password permission.
am:
9342e137c6
Change-Id: I10134040a7596000e768433943979c9af790e582
Hongming Jin [Wed, 14 Sep 2016 23:10:34 +0000 (23:10 +0000)]
Merge "Only return password for account session flow if the caller is signed with system key and have get_password permission." into nyc-dev
Scott Main [Wed, 14 Sep 2016 21:44:35 +0000 (21:44 +0000)]
Merge "add dev guide for constraint layout." into nyc-dev
am:
03ed8f30cb
Change-Id: I2c3ba7b03ab8a74476aa4efd016e42d83f266dff
smain@google.com [Wed, 14 Sep 2016 21:44:22 +0000 (21:44 +0000)]
add dev guide for constraint layout.
am:
346f6d395c
Change-Id: Icfa7b31c610e08dd3c3bdf106a35d84e74e3d689
Scott Main [Wed, 14 Sep 2016 21:33:07 +0000 (21:33 +0000)]
Merge "add dev guide for constraint layout." into nyc-dev
Hongming Jin [Fri, 29 Jul 2016 21:29:54 +0000 (14:29 -0700)]
Only return password for account session flow if the caller is signed
with system key and have get_password permission.
Bug:
30455516
Change-Id: I78484c59e4de1dff685ab91a0a8e7a756fffd9bf
Eric Schmidt [Wed, 14 Sep 2016 21:07:41 +0000 (21:07 +0000)]
docs: Fixed language directory issue. am:
e9d0adb735 -s ours
am:
192688f756
Change-Id: Ic713119028bb748befe17c5f5b6f93ce8ceb23dc
Eric Schmidt [Wed, 14 Sep 2016 20:58:45 +0000 (20:58 +0000)]
docs: Fixed language directory issue.
am:
e9d0adb735 -s ours
Change-Id: Icdffa01fe8ee2a9683cee436a2822a243d915c12
Eric Schmidt [Sun, 11 Sep 2016 22:51:35 +0000 (15:51 -0700)]
docs: Fixed language directory issue.
Bug:
31096141
Change-Id: Ibc6789f0381b25ec1449e2b180f20c96cb38a0e3
Robert Sesek [Tue, 13 Sep 2016 23:13:01 +0000 (19:13 -0400)]
Move art::Runtime::InitZygote logic from art into frameworks/base.
Test: m
Test: aosp_angler-eng boots
Change-Id: I964c70576136e7424797140b2f7d179e70298c44
Tobias Lindskog [Wed, 14 Sep 2016 14:06:30 +0000 (14:06 +0000)]
Merge "Skip ANR for processes that have been killed" am:
9d9cf5b383
am:
b35b5f2bd1
Change-Id: Iee85d717feac0d7652993d90d4157052dc4292c1
Tobias Lindskog [Wed, 14 Sep 2016 14:00:54 +0000 (14:00 +0000)]
Merge "Skip ANR for processes that have been killed"
am:
9d9cf5b383
Change-Id: I4c88713b7b174908faa6f8703257c40cabd59ae7
Treehugger Robot [Wed, 14 Sep 2016 13:54:36 +0000 (13:54 +0000)]
Merge "Skip ANR for processes that have been killed"
Narayan Kamath [Wed, 14 Sep 2016 13:21:22 +0000 (13:21 +0000)]
Merge "app_main: failure to PR_SET_NO_NEW_PRIVS is always fatal." am:
796578f9a9
am:
2b283bd24f
Change-Id: I29fe2dbc5fb012248622d39afd459570714d246f
Narayan Kamath [Wed, 14 Sep 2016 13:15:51 +0000 (13:15 +0000)]
Merge "app_main: failure to PR_SET_NO_NEW_PRIVS is always fatal."
am:
796578f9a9
Change-Id: I74c142183c3632f725b6992388235ad8e59bc389
Treehugger Robot [Wed, 14 Sep 2016 13:07:05 +0000 (13:07 +0000)]
Merge "app_main: failure to PR_SET_NO_NEW_PRIVS is always fatal."
Narayan Kamath [Tue, 13 Sep 2016 15:19:33 +0000 (16:19 +0100)]
app_main: failure to PR_SET_NO_NEW_PRIVS is always fatal.
Don't make allowances for older kernels. Kernels must handle this
properly since it is now a CTS requirement.
Also remove some unreachable return statements.
Change-Id: I280c4ed5e461d37672236747b5dbb7d1e97ecfec
liulvping [Tue, 13 Sep 2016 21:10:22 +0000 (21:10 +0000)]
Merge "fix NullPointerException in RegisteredServicesCache" am:
4b1a8f46d6
am:
506bf0741a
Change-Id: I0ec538fc78a512441517d1205ac3d34232ce992e
liulvping [Tue, 13 Sep 2016 21:04:55 +0000 (21:04 +0000)]
Merge "fix NullPointerException in RegisteredServicesCache"
am:
4b1a8f46d6
Change-Id: I1ba9512647d515aedbaf09eb2d7ac524477e5296
Treehugger Robot [Tue, 13 Sep 2016 20:57:10 +0000 (20:57 +0000)]
Merge "fix NullPointerException in RegisteredServicesCache"
John Reck [Tue, 13 Sep 2016 20:46:52 +0000 (20:46 +0000)]
Ensure munmap matches mmap am:
aa394dd42c am:
068403a842 am:
d073e28853 am:
c9cf811b50
am:
b74a6f60d1
Change-Id: If84d98a79ad8d0857f8a777e160ed6d35e07f8ae
John Reck [Tue, 13 Sep 2016 20:35:19 +0000 (20:35 +0000)]
Ensure munmap matches mmap am:
aa394dd42c am:
068403a842 am:
d073e28853
am:
c9cf811b50
Change-Id: I83e3e2d4279c8075283fb0f54521ef015ef9c596
John Reck [Tue, 13 Sep 2016 20:28:18 +0000 (20:28 +0000)]
Ensure munmap matches mmap am:
aa394dd42c am:
068403a842
am:
d073e28853
Change-Id: I2acfdb7c623470b678b59228dfdc3aafaf2b3179
John Reck [Tue, 13 Sep 2016 20:21:50 +0000 (20:21 +0000)]
Ensure munmap matches mmap am:
aa394dd42c
am:
068403a842
Change-Id: I527102b95f239c307cdea2a8bb6dcc6d032e21be
John Reck [Tue, 13 Sep 2016 20:13:27 +0000 (20:13 +0000)]
Ensure munmap matches mmap
am:
aa394dd42c
Change-Id: I80dbf9a859693cbd90aa472b04ae58d4d081d735
Joe Fernandez [Tue, 13 Sep 2016 05:58:17 +0000 (05:58 +0000)]
Merge "docs: September 2016 Dashboard update" into nyc-dev
am:
691e49b47c
Change-Id: I8fc558cbbf2d344254f24ef82263be7addb3c0f5
Joe Fernandez [Tue, 13 Sep 2016 05:58:06 +0000 (05:58 +0000)]
docs: September 2016 Dashboard update
am:
639fd11067
Change-Id: I6f434216f646b6c449be81a15bc76d23f090bf40
Kevin Hufnagle [Tue, 13 Sep 2016 05:57:51 +0000 (05:57 +0000)]
Merge "docs: Added note about permission/feature changes with network/GPS." into nyc-dev
am:
5251c874cc
Change-Id: I3f0c65b51d92eaee876c4bd752f99e7425c0d0b5
Kevin Hufnagle [Tue, 13 Sep 2016 05:57:40 +0000 (05:57 +0000)]
docs: Added note about permission/feature changes with network/GPS.
am:
0090727d95
Change-Id: Ica711ea6e5956d14fc39dcf3add3423c227eabc4
TreeHugger Robot [Tue, 13 Sep 2016 05:52:19 +0000 (05:52 +0000)]
Merge "docs: September 2016 Dashboard update" into nyc-dev
Kevin Hufnagle [Tue, 13 Sep 2016 05:49:28 +0000 (05:49 +0000)]
Merge "docs: Added note about permission/feature changes with network/GPS." into nyc-dev
Joe Fernandez [Tue, 13 Sep 2016 04:32:47 +0000 (21:32 -0700)]
docs: September 2016 Dashboard update
Change-Id: I55b5e4d64ec6ff3275a616169fe159b2dfd6c91f
Scott Main [Mon, 12 Sep 2016 21:55:15 +0000 (21:55 +0000)]
Merge "update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron Carey. bug:
30400568" into nyc-dev
am:
bf5f1674c7
Change-Id: I4aba2ed155272183204a53f13f6d8a548819fe38
smain@google.com [Mon, 12 Sep 2016 21:55:02 +0000 (21:55 +0000)]
update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron Carey. bug:
30400568
am:
b433d73843
Change-Id: I293f8176bc5992494d64113fcf26bd4ed24c37f9
Scott Main [Mon, 12 Sep 2016 21:49:59 +0000 (21:49 +0000)]
Merge "add link for how to update the gradle plugin. bug:
23725775" into nyc-dev
am:
b42e41e9c8
Change-Id: I85f0c0e2adeeb0b057a419d773ab6b8d34d170f5
smain@google.com [Mon, 12 Sep 2016 21:49:49 +0000 (21:49 +0000)]
add link for how to update the gradle plugin. bug:
23725775
am:
3d5a4c9eda
Change-Id: I830356c88dde5667f892bbfca2d7642a30575b6d
Scott Main [Mon, 12 Sep 2016 21:42:27 +0000 (21:42 +0000)]
Merge "update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron Carey. bug:
30400568" into nyc-dev
Scott Main [Mon, 12 Sep 2016 21:41:23 +0000 (21:41 +0000)]
Merge "add link for how to update the gradle plugin. bug:
23725775" into nyc-dev
Felipe Leme [Mon, 12 Sep 2016 21:18:13 +0000 (21:18 +0000)]
Merge "DO NOT MERGE. Listen to ACTION_UID_REMOVED only." am:
1bb0616c56 -s ours
am:
04829c4ddd -s ours
Change-Id: I87396b8ffe7937ad2264c569246f87a9a819e4f9
Felipe Leme [Mon, 12 Sep 2016 21:14:10 +0000 (21:14 +0000)]
Merge "DO NOT MERGE. Listen to ACTION_UID_REMOVED only."
am:
1bb0616c56 -s ours
Change-Id: I281ad8d15f59927185e6beaf209c609f2282ef61
Treehugger Robot [Mon, 12 Sep 2016 21:07:39 +0000 (21:07 +0000)]
Merge "DO NOT MERGE. Listen to ACTION_UID_REMOVED only."
Mitchell Wills [Mon, 12 Sep 2016 21:04:49 +0000 (21:04 +0000)]
Merge "Add a flag to indicate if a ScanData is for a scan for all channels" am:
c7b84e6d0d
am:
d8a5904abe
Change-Id: I92f3dc3aa1f3f110426965ec232e2a8b0b5f068b
Robert Sesek [Mon, 12 Sep 2016 21:04:43 +0000 (21:04 +0000)]
Merge changes I104e6133,I54f04c03 am:
191ddb0c27
am:
80c75db311
Change-Id: Ic8a6c7776418240154ec350dd1f72638b4129c18
Robert Sesek [Mon, 12 Sep 2016 21:03:03 +0000 (21:03 +0000)]
Split the zygote logic out of android.os.Process into a new ZygoteProcess class. am:
96b49848e7 -s ours
am:
b25389bda0
Change-Id: I761f8ba65fa94be276da16435286313e96d583df
Tobias Sargeant [Mon, 12 Sep 2016 21:02:02 +0000 (21:02 +0000)]
Refactor ZygoteInit to support a WebView-specific zygote. am:
b9679dc1fa -s ours
am:
e38df31d10
Change-Id: I4ac69d33f4a46294bc1437fb574f30412033ed01
Mitchell Wills [Mon, 12 Sep 2016 20:54:46 +0000 (20:54 +0000)]
Merge "Add a flag to indicate if a ScanData is for a scan for all channels"
am:
c7b84e6d0d
Change-Id: I8c874c282db93dbb531c9c7e27540044c446144e
Robert Sesek [Mon, 12 Sep 2016 20:54:42 +0000 (20:54 +0000)]
Merge changes I104e6133,I54f04c03
am:
191ddb0c27
Change-Id: I7376f7594314c26926c3b41ffbe4202b865f9091
Robert Sesek [Mon, 12 Sep 2016 20:54:39 +0000 (20:54 +0000)]
Split the zygote logic out of android.os.Process into a new ZygoteProcess class.
am:
96b49848e7 -s ours
Change-Id: I2796758fa0a083ade4b4186eae7210c841c719ed
Tobias Sargeant [Mon, 12 Sep 2016 20:52:36 +0000 (20:52 +0000)]
Refactor ZygoteInit to support a WebView-specific zygote.
am:
b9679dc1fa -s ours
Change-Id: I6071cb6e8ed2f85351c9fc23f88beed0c6b1fdc9
Mitchell Wills [Mon, 12 Sep 2016 20:38:20 +0000 (20:38 +0000)]
Merge "Add a flag to indicate if a ScanData is for a scan for all channels"
Wyatt Riley [Mon, 12 Sep 2016 20:33:16 +0000 (20:33 +0000)]
LocationManager - Handle Shutdown for right User
am:
a8037fffd3
Change-Id: I0fa5f32154e040c16f3fcff1d7454443c93f6691
Wyatt Riley [Thu, 4 Aug 2016 23:10:06 +0000 (16:10 -0700)]
LocationManager - Handle Shutdown for right User
Only process a shutdown when it is for all users (whole system),
not a single user
Change-Id: Id51b7fb4606460462c2f6749e5ac3984bdd8319f
Bug:
30646142
(cherry picked from commit
1b24fb17b8613894d6066dcf408e60caf2a56192)
Treehugger Robot [Mon, 12 Sep 2016 19:42:01 +0000 (19:42 +0000)]
Merge changes I104e6133,I54f04c03
* changes:
Split the zygote logic out of android.os.Process into a new ZygoteProcess class.
Refactor ZygoteInit to support a WebView-specific zygote.
Eino-Ville Talvala [Mon, 12 Sep 2016 19:26:40 +0000 (19:26 +0000)]
Merge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc-dev
am:
e93c655093 -s ours
Change-Id: I9652b84387a9edaf628c00bae3efa4020292d6f2
Eino-Ville Talvala [Mon, 12 Sep 2016 19:24:56 +0000 (19:24 +0000)]
DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method
am:
e175aa82b5 -s ours
Change-Id: I6fdae71d780f5214d19474bfaa6d5544419e5ef4
Eino-Ville Talvala [Mon, 12 Sep 2016 19:20:02 +0000 (19:20 +0000)]
Merge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc-dev
smain@google.com [Mon, 12 Sep 2016 19:07:26 +0000 (12:07 -0700)]
add link for how to update the gradle plugin.
bug:
23725775
Change-Id: I5338cec2fed09b4b91e063d989b311d027b169ed
Andrew Solovay [Mon, 12 Sep 2016 18:54:20 +0000 (18:54 +0000)]
Merge "docs: Updated for Support Library 24.2.1" into nyc-dev
am:
2f4c688710
Change-Id: Ib270874dfcc55c21d41a5dc393f42130f1fea609
Andrew Solovay [Mon, 12 Sep 2016 18:54:14 +0000 (18:54 +0000)]
docs: Updated for Support Library 24.2.1
am:
88082e9ff8
Change-Id: I835121af05716f91663e74c4a5f4b78da670ee40
Andrew Solovay [Mon, 12 Sep 2016 18:45:05 +0000 (18:45 +0000)]
Merge "docs: Updated for Support Library 24.2.1" into nyc-dev
Mitchell Wills [Tue, 6 Sep 2016 22:08:36 +0000 (15:08 -0700)]
Add a flag to indicate if a ScanData is for a scan for all channels
BUG=
30897947
Change-Id: I919d7fa9c3bf196371e506d23e393a9d609a5b4b
(cherry picked from commit
4bfb391c91b3539d2ec20ffd7e01056dafa0984d)
John Reck [Mon, 12 Sep 2016 17:43:35 +0000 (10:43 -0700)]
Ensure munmap matches mmap
Bug:
31350622
Change-Id: I6d3f9faec32d54360caa6706d17405e20b50966c
Elliott Hughes [Mon, 12 Sep 2016 17:07:44 +0000 (17:07 +0000)]
Merge "Move frameworks/base to std::unique_ptr." am:
a4739b86b5
am:
96b3bc7aff
Change-Id: Iac739b0a727558893696b8d8454d63dfb39c548a
Elliott Hughes [Mon, 12 Sep 2016 17:00:09 +0000 (17:00 +0000)]
Merge "Move frameworks/base to std::unique_ptr."
am:
a4739b86b5
Change-Id: Ib07b6585faf4a8b3cc1c2f3e46f1ee27b4865db2
Elliott Hughes [Mon, 12 Sep 2016 16:50:17 +0000 (16:50 +0000)]
Merge "Move frameworks/base to std::unique_ptr."
Elliott Hughes [Sun, 11 Sep 2016 21:50:12 +0000 (14:50 -0700)]
Move frameworks/base to std::unique_ptr.
Bug: http://b/
22403888
Change-Id: Iae2c68b00be7cd9dd215a75cf80b16d7403f6328
Chih-hung Hsieh [Sat, 10 Sep 2016 17:20:37 +0000 (17:20 +0000)]
Merge "Fix google-explicit-constructor warnings in media utils." am:
5e91082b3c
am:
d1dd5ae76b
Change-Id: I71778eb5a253ebf5342f863d34e178513d386783
Chih-hung Hsieh [Sat, 10 Sep 2016 17:15:05 +0000 (17:15 +0000)]
Merge "Fix google-explicit-constructor warnings in media utils."
am:
5e91082b3c
Change-Id: I4bb1f347db727e86c1255ccbb0e15dc9cc00169f
Chih-hung Hsieh [Sat, 10 Sep 2016 17:07:53 +0000 (17:07 +0000)]
Merge "Fix google-explicit-constructor warnings in media utils."
Sungsoo [Sat, 10 Sep 2016 00:55:19 +0000 (00:55 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e am:
40d3c1a7f0 am:
2ddc2956fd -s ours am:
deeb0e5246 am:
8ec076623b am:
89e328770d am:
d98163c7a6 -s ours
am:
054d2931a0
Change-Id: I42e7db05b2990a5e5818bbee31a96ad346360fa7
Sungsoo [Sat, 10 Sep 2016 00:30:22 +0000 (00:30 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e am:
40d3c1a7f0 am:
2ddc2956fd -s ours am:
deeb0e5246 am:
8ec076623b am:
89e328770d
am:
d98163c7a6 -s ours
Change-Id: Iaa9d3a28872d990cb5196086f9deaaa1d03336cc
Sungsoo [Sat, 10 Sep 2016 00:22:56 +0000 (00:22 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e am:
40d3c1a7f0 am:
2ddc2956fd -s ours am:
deeb0e5246 am:
8ec076623b
am:
89e328770d
Change-Id: I400b511b84f599ea05fb33a5db5dbc8da2c031b0
OSDN Git Service
