OSDN Git Service
Casey Dahlin [Thu, 12 Nov 2015 23:57:58 +0000 (23:57 +0000)]
Merge "Add hidden support for arrays of raw file descriptors"
am:
376d5f350c
* commit '
376d5f350c6618d915338a9927b5d0f5fb61eba8':
Add hidden support for arrays of raw file descriptors
Casey Dahlin [Thu, 12 Nov 2015 23:50:05 +0000 (23:50 +0000)]
Merge "Add hidden support for arrays of raw file descriptors"
Casey Dahlin [Thu, 5 Nov 2015 20:19:13 +0000 (12:19 -0800)]
Add hidden support for arrays of raw file descriptors
Change-Id: I4013e0700369764a26485d8620ebf16d8bea1951
Test: Built and ran Android in an emulator
Bug:
25242023
Signed-off-by: Casey Dahlin <sadmac@google.com>
Chad Brubaker [Thu, 12 Nov 2015 19:34:52 +0000 (19:34 +0000)]
Merge "Support X509TrustManagerExtensions methods"
am:
b324fb18d9
* commit '
b324fb18d916d7037ef7c94a1d54b55d50ffc9c7':
Support X509TrustManagerExtensions methods
Chad Brubaker [Thu, 12 Nov 2015 19:33:31 +0000 (19:33 +0000)]
Merge "Use duck typing in X509TrustManagerExtensions"
am:
9c3982f75d
* commit '
9c3982f75da19e2c0e146e7f251514a44412da0c':
Use duck typing in X509TrustManagerExtensions
Chad Brubaker [Thu, 12 Nov 2015 19:28:54 +0000 (19:28 +0000)]
Merge "Support X509TrustManagerExtensions methods"
Chad Brubaker [Thu, 12 Nov 2015 19:28:21 +0000 (19:28 +0000)]
Merge "Use duck typing in X509TrustManagerExtensions"
Svetoslav Ganov [Thu, 12 Nov 2015 16:05:07 +0000 (16:05 +0000)]
Merge "System crash fixed when turn off MagnificationGesture"
am:
8f87949340
* commit '
8f87949340e858ff4e24615709080978b017f644':
System crash fixed when turn off MagnificationGesture
Wale Ogunwale [Thu, 12 Nov 2015 16:01:22 +0000 (16:01 +0000)]
Merge "Avoid configuration of callback being reset after relayout."
am:
cbcafde45e
* commit '
cbcafde45ec28d62ce674d215c0264f41580d9a6':
Avoid configuration of callback being reset after relayout.
Svetoslav Ganov [Thu, 12 Nov 2015 16:00:28 +0000 (16:00 +0000)]
Merge "System crash fixed when turn off MagnificationGesture"
Wale Ogunwale [Thu, 12 Nov 2015 15:55:18 +0000 (15:55 +0000)]
Merge "Avoid configuration of callback being reset after relayout."
riddle_hsu [Thu, 12 Nov 2015 06:07:12 +0000 (14:07 +0800)]
Avoid configuration of callback being reset after relayout.
mPendingConfiguration is a parameter of IWindowSession.relayout.
And IWindowSession.aidl declared "out Configuration outConfig",
it will always create a new configuration for remote side to write.
If remote side does not write (WMS does not have config change),
the new default configuration will be returned.
In original code passes mPendingConfiguration to updateConfiguration
directly, then callbacks (sConfigCallbacks) receive the same
instance of mPendingConfiguration. And because the implementation
of callback may use the configuration after relayout has reset
the configuration to default, then it may have timing that results
"showing hybrid of portrait and landscape modes" which try to fix
in commit
e36d6e27.
To avoid this, always create a copy to updateConfiguration.
MSG_RESIZED_REPORT from dispatchResized also did the same thing.
Related commit:
e36d6e277e49475076b7872d36ea6a5c5b996e9d
694f79b5d1196640d1beb680b7d1fc68e6e77cbd
Change-Id: Ic1abd596e384918224b3a7020583d9a04641cccc
Chad Brubaker [Tue, 10 Nov 2015 23:50:08 +0000 (15:50 -0800)]
Support X509TrustManagerExtensions methods
Change-Id: I14a405e90f139b8d73eb9f88597fac804a7c18f3
Chad Brubaker [Tue, 10 Nov 2015 23:40:26 +0000 (15:40 -0800)]
Use duck typing in X509TrustManagerExtensions
X509TrustManagerExtensions assumes that the default X509TrustManager is
an instance of conscrypt's TrustManagerImpl. That's no longer going to
always be the case. Instead use duck typing to support any
X509TrustManagers that have the extra methods required for
X509TrustManagerExtensions.
Change-Id: If23471bda590d5e131bb1e802a60599957bc7f37
Chad Brubaker [Wed, 11 Nov 2015 20:32:03 +0000 (20:32 +0000)]
Merge "Add NetworkSecurityConfigProvider"
am:
d1c469e876
* commit '
d1c469e8769822c48584034076861331fd792a7c':
Add NetworkSecurityConfigProvider
Amith Yamasani [Wed, 11 Nov 2015 20:30:32 +0000 (20:30 +0000)]
Merge "Fix system watchdog timeout when reading too many usage events."
am:
10b0bae06f
* commit '
10b0bae06ffdeb79494ddd1aff19387b56770960':
Fix system watchdog timeout when reading too many usage events.
Chad Brubaker [Wed, 11 Nov 2015 20:25:04 +0000 (20:25 +0000)]
Merge "Add NetworkSecurityConfigProvider"
Amith Yamasani [Wed, 11 Nov 2015 20:24:39 +0000 (20:24 +0000)]
Merge "Fix system watchdog timeout when reading too many usage events."
Chad Brubaker [Wed, 11 Nov 2015 19:21:32 +0000 (19:21 +0000)]
Merge "Add support for debug-overrides configuration"
am:
f1e813ea33
* commit '
f1e813ea334c947ae0397bfa3a8e42be4fd4ae8c':
Add support for debug-overrides configuration
Chad Brubaker [Wed, 11 Nov 2015 19:03:30 +0000 (19:03 +0000)]
Merge "Add support for debug-overrides configuration"
Chad Brubaker [Tue, 10 Nov 2015 20:26:18 +0000 (12:26 -0800)]
Add NetworkSecurityConfigProvider
Change-Id: I321e3ca94cc2a8d5e0e5d82a83b255ff5b8a71d2
John Reck [Wed, 11 Nov 2015 17:59:16 +0000 (17:59 +0000)]
Merge "Fix memory corruption in SpotShadow"
am:
8c85c00b5e
* commit '
8c85c00b5e8fffb226f4af225a67425b8d0f190b':
Fix memory corruption in SpotShadow
John Reck [Wed, 11 Nov 2015 17:52:08 +0000 (17:52 +0000)]
Merge "Fix memory corruption in SpotShadow"
Calin Juravle [Wed, 11 Nov 2015 17:00:22 +0000 (17:00 +0000)]
Merge "Parse method-trace properties only in debug builds."
am:
8fa7e93050
* commit '
8fa7e93050f5b3d7ccac8775fee302f1f4394d4f':
Parse method-trace properties only in debug builds.
Calin Juravle [Wed, 11 Nov 2015 16:54:52 +0000 (16:54 +0000)]
Merge "Parse method-trace properties only in debug builds."
Keith Mok [Wed, 11 Nov 2015 00:52:05 +0000 (16:52 -0800)]
Fix memory corruption in SpotShadow
The array list is too small and causing stack corruption
Change-Id: I0e34dad39357fb63977d2ce6f183ced7b6a632be
Calin Juravle [Tue, 10 Nov 2015 19:30:45 +0000 (19:30 +0000)]
Parse method-trace properties only in debug builds.
Bug:
25612377
Change-Id: Ia1d8e6c5afbdd70486d5aa8c059e70e27b03367d
John Reck [Tue, 10 Nov 2015 23:26:01 +0000 (23:26 +0000)]
Merge "Fix HWUI Path Cache dangling pointer"
am:
37bf3ec9d2
* commit '
37bf3ec9d2fb3dfdccfe043e51723e4e543f0703':
Fix HWUI Path Cache dangling pointer
John Reck [Tue, 10 Nov 2015 23:20:03 +0000 (23:20 +0000)]
Merge "Fix HWUI Path Cache dangling pointer"
Chad Brubaker [Mon, 9 Nov 2015 21:38:51 +0000 (13:38 -0800)]
Add support for debug-overrides configuration
Debug overrides are only used if the application is debuggable in
order to help local debugging and development by trusting additional
CAs. In a non-debuggable version of the application the debug-overrides
are ignored.
Trust anchors in the debug override configuration have two key
differences from those in base-config and domain-config:
1) trust anchors in the debug-overrides are trusted for all connections
in addition to any trust anchors included in the relevant base/domain
configs.
2) By default trust anchors in the debug config override pins, as their
purpose is for connecting to non-standard servers for debugging and
testing and those servers should not be pinned in the production
configuration.
Change-Id: I15ee98eae182be0ffaa49b06bc5e1c6c3d22baee
Svetoslav Ganov [Tue, 10 Nov 2015 01:03:05 +0000 (01:03 +0000)]
Merge "Avoid NPE in printspooler when changing language"
am:
8d8515e708
* commit '
8d8515e708f0cebf69587750bbb3abcb315cc61e':
Avoid NPE in printspooler when changing language
Svetoslav Ganov [Tue, 10 Nov 2015 00:58:28 +0000 (00:58 +0000)]
Merge "Avoid NPE in printspooler when changing language"
Nick Kralevich [Mon, 9 Nov 2015 20:28:30 +0000 (20:28 +0000)]
Merge "system_server: allow /proc read access to other UIDs"
am:
51b48b3877
* commit '
51b48b38774b8babe339890e1c888dfd8647ee72':
system_server: allow /proc read access to other UIDs
Nick Kralevich [Mon, 9 Nov 2015 20:05:22 +0000 (20:05 +0000)]
Merge "system_server: allow /proc read access to other UIDs"
Digish Pandya [Wed, 4 Nov 2015 05:30:28 +0000 (11:00 +0530)]
Fix HWUI Path Cache dangling pointer
When precache, PathTexture is added to PathCache, and it is released after drawn if we want to clean it.
But the PathCache LRU still holds the entry of the PathTexture object. When trim the cache in
the end of each frame, LRU finds that its mListener is not NULL and invoke the functor, however,
mListerer points to the released PathTexture object and is a dangling pointer, thus leads to crash.
Smart pointer don't help here since they only manage scopes, while PathTexture is also controled by
its cleanup field.
The fix is to also remove the LRU entry of PathTexture*, it will also release the texture object
and there won't be texture leaks.
Change-Id: Iaa0621df5dc71532e9e75b38ad94384353930b95
Mark Lu [Fri, 6 Nov 2015 07:26:15 +0000 (15:26 +0800)]
Fix system watchdog timeout when reading too many usage events.
Symptom:
As issue link:
https://code.google.com/p/android/issues/detail?id=193100
RootCause:
UsageStatsService.onDisplayChanged executed in system main thread,
If calling UsageStatsManager.queryEvents with too many events before it
(i.e. in daily usage event file,
too many activity resume / pause events or configuration change
during monkey test),
System will be blocked then watchdog timeout.
Solution:
Let display listener executed in background thread handler
Change-Id: Ic894d112612400ed8fb7ba843b3309fdc4f66fe1
Nick Kralevich [Sun, 8 Nov 2015 01:04:04 +0000 (17:04 -0800)]
system_server: allow /proc read access to other UIDs
Add system_server to AID_READPROC, to allow system_server to read
/proc entries associated with other UIDs.
Bug:
23310674
Change-Id: I1602b8ee30670cde4ed56e2f901524c105895352
Chad Brubaker [Sat, 7 Nov 2015 22:16:10 +0000 (22:16 +0000)]
Merge "Support nested domain-config elements"
am:
749501e88e
* commit '
749501e88e5fa6bdc6594a9db5c232e31bdda867':
Support nested domain-config elements
Chad Brubaker [Sat, 7 Nov 2015 22:14:36 +0000 (22:14 +0000)]
Merge "Add xml source for network security configuration"
am:
ead46ecc84
* commit '
ead46ecc843e3686ff5ae8008f4452fc79f847e7':
Add xml source for network security configuration
Chad Brubaker [Sat, 7 Nov 2015 22:11:04 +0000 (22:11 +0000)]
Merge "Support nested domain-config elements"
Chad Brubaker [Sat, 7 Nov 2015 22:10:50 +0000 (22:10 +0000)]
Merge "Add xml source for network security configuration"
Chad Brubaker [Sat, 7 Nov 2015 07:02:37 +0000 (23:02 -0800)]
Support nested domain-config elements
Nested domain-config inherit unset parameters from the domain-config
they are nested in. This helps avoid copy and pasted configs that are
almost the same except a few minor differences for a domain with
slightly different requirements.
For example: Consider a domain-config for example.com that, among other
settings, does not enforce hsts. Now if you want the rules for
example.com to apply to secure.example.com except that hsts _is_
enforced you can make a nested domain-config for secure.example.com
under example.com that sets hstsEnforced="true" and nothing else.
Change-Id: I9e33f7e62127fd7f4f15c3560fff2f2626477bd4
Chad Brubaker [Thu, 5 Nov 2015 07:55:29 +0000 (23:55 -0800)]
Add xml source for network security configuration
XmlConfigSource parses an ApplicationConfig from an xml resource.
Currently this supports app-wide default configuration via the
base-config element, per domain via the domain-config element and
inheritance of unset properties at parse time.
Inheritance of unset properties is currently only:
domain-config -> base-config -> platform default configuration
Where the most specific value is used.
For example: If the base-config specifies trust anchors, all connections
will use those anchors except for connections to a domain which has a
domain-config that specifies trust anchors, in which case the
domain-config's trust anchors will be used. If the domain-config or
base-config don't set trust anchors, or don't exist, then the platform
default trust anchors will be used.
Nested domain-config entries, debug-overrides, and thorough
documentation of the xml format will follow in later commits.
Change-Id: I1232ff1e8079a81b340bc12e142f0889f6947aa0
Chad Brubaker [Sat, 7 Nov 2015 02:42:05 +0000 (02:42 +0000)]
Merge "Fix incorrect hstsEnforced lookup"
am:
1347cb81f4
* commit '
1347cb81f402c628f3346ea350a5862749901d59':
Fix incorrect hstsEnforced lookup
Chad Brubaker [Sat, 7 Nov 2015 02:37:45 +0000 (02:37 +0000)]
Merge "Fix incorrect hstsEnforced lookup"
Chad Brubaker [Sat, 7 Nov 2015 02:08:12 +0000 (18:08 -0800)]
Fix incorrect hstsEnforced lookup
Change-Id: I00364d8c1d3311bebd3ad88e557860e694ba5018
Chad Brubaker [Fri, 6 Nov 2015 21:10:54 +0000 (21:10 +0000)]
Merge "Fix directory check in UserCertificateSource"
am:
1483ee3aa5
* commit '
1483ee3aa5737f9aff06021b5ec9fe3086ee2e66':
Fix directory check in UserCertificateSource
Chad Brubaker [Fri, 6 Nov 2015 21:09:11 +0000 (21:09 +0000)]
Merge "Fix incorrect hasPerDomainConfigs check"
am:
c5c51dafb3
* commit '
c5c51dafb3ede95622eb350dae0b662abb611925':
Fix incorrect hasPerDomainConfigs check
Chad Brubaker [Fri, 6 Nov 2015 21:02:23 +0000 (21:02 +0000)]
Merge "Fix directory check in UserCertificateSource"
Chad Brubaker [Fri, 6 Nov 2015 21:02:01 +0000 (21:02 +0000)]
Merge "Fix incorrect hasPerDomainConfigs check"
Chad Brubaker [Fri, 6 Nov 2015 20:52:12 +0000 (12:52 -0800)]
Fix directory check in UserCertificateSource
If the user has not added any CAs to the user trust store the user-added
directory will not have been created.
Change-Id: I8b5f73af3c0761c56969874231004fedbf7badda
Chad Brubaker [Fri, 6 Nov 2015 20:50:31 +0000 (12:50 -0800)]
Fix incorrect hasPerDomainConfigs check
Change-Id: Iaeedbbcc5f12475d346a77dba84b38a1d3d8d346
Chad Brubaker [Fri, 6 Nov 2015 20:25:33 +0000 (20:25 +0000)]
Merge "Use a builder for NetworkSecurityConfig"
am:
7e98f2e697
* commit '
7e98f2e6976fb38c5c3a7421547d1756ba5faafe':
Use a builder for NetworkSecurityConfig
Chad Brubaker [Fri, 6 Nov 2015 20:21:29 +0000 (20:21 +0000)]
Merge "Use a builder for NetworkSecurityConfig"
Masaaki Iwaguchi [Fri, 6 Nov 2015 11:38:27 +0000 (12:38 +0100)]
System crash fixed when turn off MagnificationGesture
Symptom:
WindowManagerService throws exception and system crashes.
Root cause:
When the MagnificationGesture is turned off during animation of scale
up/down, WindowManagerService.mAccessibilityController can be null so
exception is thrown.
Solution:
Cancel ongoing animation before turning off MagnificationGesture.
Change-Id: I469d84e024bdd453e3729a69229398233ed2eb61
Svetoslav Ganov [Fri, 6 Nov 2015 00:40:48 +0000 (00:40 +0000)]
Merge "Take into account default app for default grants"
am:
7abb36599d
* commit '
7abb36599d9537296d9a51f766152025c6ed0491':
Take into account default app for default grants
Svetoslav Ganov [Fri, 6 Nov 2015 00:34:21 +0000 (00:34 +0000)]
Merge "Take into account default app for default grants"
Svetoslav [Fri, 6 Nov 2015 00:33:02 +0000 (16:33 -0800)]
Take into account default app for default grants
Change-Id: Ib78c7dbda65d405bbf74544cad18e5e10bfcdeec
Svetoslav Ganov [Fri, 6 Nov 2015 00:31:13 +0000 (00:31 +0000)]
Merge "Revert "Take into account default app for default grants""
am:
9ae3aeec53
* commit '
9ae3aeec532ce5a7908d395049efb61399875360':
Revert "Take into account default app for default grants"
Svetoslav Ganov [Fri, 6 Nov 2015 00:24:59 +0000 (00:24 +0000)]
Merge "Revert "Take into account default app for default grants""
Svetoslav Ganov [Fri, 6 Nov 2015 00:24:47 +0000 (00:24 +0000)]
Revert "Take into account default app for default grants"
Apparently OEMs can set the chooser so this patch is not enough since it assumes the chooser is a platform component.
This reverts commit
fce33d58d87fd494686aae4e21332b58ec260b73.
Change-Id: I3b8e499d2f0a731a227d193f6c5d6ed528be2272
Tenghui Zhu [Fri, 6 Nov 2015 00:00:33 +0000 (00:00 +0000)]
Merge "When the incoming light source is invalid, don\'t generate any shadow"
am:
3226c57321
* commit '
3226c57321f15384ef7c1e93589c6d2a58cbe86c':
When the incoming light source is invalid, don't generate any shadow
Tenghui Zhu [Thu, 5 Nov 2015 23:56:56 +0000 (23:56 +0000)]
Merge "When the incoming light source is invalid, don't generate any shadow"
Teng-Hui Zhu [Thu, 5 Nov 2015 00:57:53 +0000 (16:57 -0800)]
When the incoming light source is invalid, don't generate any shadow
b/
25417885
Change-Id: I4b87e35ca68091fd0409cb9fe9b9400af860a507
Chad Brubaker [Thu, 5 Nov 2015 07:36:07 +0000 (23:36 -0800)]
Use a builder for NetworkSecurityConfig
The builder supports all the standard builder set* methods as well as
setting a parent builder to use when values are not set (recursively).
This allows us to have a level of inheretence in configurations without
complicating the lookup and trust checking logic by doing inheretence
when building the configs.
Change-Id: I054af83451e52761227479eadf9cb9803437505f
Baligh Uddin [Thu, 5 Nov 2015 19:49:59 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:49:31 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:49:27 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:49:23 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:49:19 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:49:17 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Dan Albert [Thu, 5 Nov 2015 19:41:33 +0000 (19:41 +0000)]
Merge branch 'stage-aosp-master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master
Dan Albert [Thu, 5 Nov 2015 19:40:59 +0000 (19:40 +0000)]
Merge "Use std::unique_ptr instead of UniquePtr."
am:
22b7e496c2
* commit '
22b7e496c23c76b1f6d94e3ce99f39f9d3bca973':
Use std::unique_ptr instead of UniquePtr.
Baligh Uddin [Thu, 5 Nov 2015 19:40:41 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:40:25 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:40:15 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:40:04 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:39:20 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:39:16 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:39:12 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Dan Albert [Thu, 5 Nov 2015 19:32:43 +0000 (19:32 +0000)]
Merge "Use std::unique_ptr instead of UniquePtr."
Baligh Uddin [Thu, 5 Nov 2015 19:32:07 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:32:05 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Chad Brubaker [Thu, 5 Nov 2015 18:52:46 +0000 (18:52 +0000)]
Merge "Add initial network security config implementation"
am:
8c35820720
* commit '
8c358207206c5e19541c65e3f9761d1adb54550b':
Add initial network security config implementation
Chad Brubaker [Thu, 5 Nov 2015 18:46:24 +0000 (18:46 +0000)]
Merge "Add initial network security config implementation"
Brian Carlstrom [Thu, 5 Nov 2015 18:42:53 +0000 (18:42 +0000)]
Merge "Fixes for sm and pm usage"
am:
ffb15da518
* commit '
ffb15da518e35727e218bfba48927902d4368e2f':
Fixes for sm and pm usage
Brian Carlstrom [Thu, 5 Nov 2015 18:38:56 +0000 (18:38 +0000)]
Merge "Fixes for sm and pm usage"
Brian Carlstrom [Thu, 5 Nov 2015 18:33:40 +0000 (10:33 -0800)]
Fixes for sm and pm usage
sm showed IllegalArgumentException after usage.
pm inconsistently used "return showUsage()"
Bug:
20948199
Change-Id: I5828489a9d4ef2eabfb97dd408d66e1560a5a983
Dan Albert [Thu, 5 Nov 2015 18:22:57 +0000 (18:22 +0000)]
Merge "Don\'t apply clang flag to gcc builds."
am:
d9a1b35df6
* commit '
d9a1b35df62eddc56f69281aea1534d187b63205':
Don't apply clang flag to gcc builds.
Dan Albert [Thu, 5 Nov 2015 18:18:45 +0000 (18:18 +0000)]
Merge "Don't apply clang flag to gcc builds."
Masaaki Iwaguchi [Fri, 3 Apr 2015 07:11:39 +0000 (16:11 +0900)]
Avoid NPE in printspooler when changing language
PrintActivity is recreated when the language setting is changed.
As a result of the recreation mCurrentPrinter is null, which causes
a NullPointerException when onActivityResult() is called.
The issue is solved with a simple null check.
Change-Id: Ic58f0ca01577d2ec02d494739f3bc2f06240dd44
Dan Albert [Thu, 5 Nov 2015 08:59:09 +0000 (00:59 -0800)]
Don't apply clang flag to gcc builds.
For whatever reason GCC doesn't fail the build on unknown flags unless
there is also a warning emitted. Since we're now deprecating
UniquePtr, the warning is thrown here and the build fails (despite not
being -Werror).
Bug: http://b/
22403888
Change-Id: I4af7911a51f7af9aa47a596a76f3e9d79535585b
Dan Albert [Thu, 5 Nov 2015 08:57:12 +0000 (00:57 -0800)]
Use std::unique_ptr instead of UniquePtr.
We're deprecating UniquePtr, so we need to move to the real thing.
Bug: http://b/
22403888
Change-Id: I5b7fdf4924dd8c12a8c7dba89278714ca6fdc60a
Svetoslav Ganov [Thu, 5 Nov 2015 02:25:32 +0000 (02:25 +0000)]
Merge "Take into account default app for default grants"
am:
82eeb2f20c
* commit '
82eeb2f20c934ddc97380032b3c8ecacc21d9a04':
Take into account default app for default grants
Svetoslav Ganov [Thu, 5 Nov 2015 02:23:44 +0000 (02:23 +0000)]
Merge "Enforce weaker grant if app is default handler for miltiple action"
am:
035374d7a2
* commit '
035374d7a29b4e0b0bc71bdfb3555b2e547ce1da':
Enforce weaker grant if app is default handler for miltiple action
Svetoslav Ganov [Thu, 5 Nov 2015 02:19:12 +0000 (02:19 +0000)]
Merge "Take into account default app for default grants"
Svetoslav Ganov [Thu, 5 Nov 2015 02:19:00 +0000 (02:19 +0000)]
Merge "Enforce weaker grant if app is default handler for miltiple action"
Svetoslav [Tue, 3 Nov 2015 02:40:18 +0000 (18:40 -0800)]
Enforce weaker grant if app is default handler for miltiple action
Change-Id: Ibc46e458e277412ebb276eb5ba6f2765b6b6c5e9
Baligh Uddin [Wed, 4 Nov 2015 23:59:57 +0000 (15:59 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I20cf8ac4a5039ead0a65bd2e38ded78542a7a3e8
Baligh Uddin [Wed, 4 Nov 2015 23:57:40 +0000 (15:57 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I924e59eeff537a0f66ae7ac7ace1dacd1f89f35e