OSDN Git Service
Christopher Tate [Thu, 13 Jul 2017 22:18:38 +0000 (15:18 -0700)]
Don't crash when external storage is unmounted
In particular, don't NPE if an app calls getExternalFilesDir() while
external storage is unmounted. We were making assumptions about the
length of the array returned by the "tell me about all the external
locations" method, but in unmounted cases that array can be zero-sized.
(And similar for getObbDir() and getExternalCacheDir().)
Bug:
63604311
Test: manual
Change-Id: I4dec828161245047182e6fd39a0df10dd1681ba2
TreeHugger Robot [Thu, 13 Jul 2017 21:35:42 +0000 (21:35 +0000)]
Merge "Remove duplicate attrs."
Doris Ling [Thu, 13 Jul 2017 21:22:00 +0000 (21:22 +0000)]
Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev am:
9f675cee28
am:
db0ec7d60f
Change-Id: I7ef8fb885ee70d05b9afee829f8278f4236c9eb0
Doris Ling [Thu, 13 Jul 2017 21:15:21 +0000 (21:15 +0000)]
Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev
am:
9f675cee28
Change-Id: I32b19e453af7a28c990a28b9726487415fe5be6f
TreeHugger Robot [Thu, 13 Jul 2017 20:59:39 +0000 (20:59 +0000)]
Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev
Tomasz Wasilczyk [Thu, 13 Jul 2017 20:50:10 +0000 (20:50 +0000)]
Merge "Publish new Broadcast Radio APIs."
Jorim Jaggi [Thu, 13 Jul 2017 20:32:47 +0000 (20:32 +0000)]
Merge "Also go to sleep when dozing" into oc-dr1-dev am:
be1577ae59
am:
efe90f8df1
Change-Id: I968bd2e3071f9f4024430b2718372339a57b6380
Nikolas Bravo [Thu, 13 Jul 2017 20:20:57 +0000 (20:20 +0000)]
Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev am:
479d915db5
am:
de93e6912f
Change-Id: I861c5f7d4527d297e8049fbd6fddb3a5f96248fc
Jorim Jaggi [Thu, 13 Jul 2017 20:20:27 +0000 (20:20 +0000)]
Merge "Also go to sleep when dozing" into oc-dr1-dev
am:
be1577ae59
Change-Id: If8fea9defc84fcd3f7f8f2c98dcb00f13f7ffffc
Jorim Jaggi [Thu, 13 Jul 2017 20:13:33 +0000 (20:13 +0000)]
Merge "Also go to sleep when dozing" into oc-dr1-dev
Christopher Ferris [Thu, 13 Jul 2017 20:10:47 +0000 (20:10 +0000)]
Merge "Implement dumpheap -m."
Android Build Merger (Role) [Thu, 13 Jul 2017 20:07:09 +0000 (20:07 +0000)]
Merge "Merge "Tear down agent after preflight rejection" into oc-dr1-dev am:
47303ec66b am:
19bb6c35ca"
Abodunrinwa Toki [Thu, 13 Jul 2017 20:06:12 +0000 (20:06 +0000)]
Merge "TextClassification.text is nullable"
Nikolas Bravo [Thu, 13 Jul 2017 20:05:55 +0000 (20:05 +0000)]
Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev
am:
479d915db5
Change-Id: I3503c8306bb12da6ad1273ef207f550a37775b7b
Christopher Tate [Thu, 13 Jul 2017 20:05:40 +0000 (20:05 +0000)]
Merge "Tear down agent after preflight rejection" into oc-dr1-dev am:
47303ec66b
am:
19bb6c35ca
Change-Id: I17cbc0a91b65d755965ac4479d7656a7dbeef109
TreeHugger Robot [Thu, 13 Jul 2017 20:04:56 +0000 (20:04 +0000)]
Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t."
TreeHugger Robot [Thu, 13 Jul 2017 20:03:11 +0000 (20:03 +0000)]
Merge "Remove AppCompat from TouchLatency test"
Seigo Nonaka [Thu, 13 Jul 2017 20:02:29 +0000 (20:02 +0000)]
Merge "Implement family fallback."
TreeHugger Robot [Thu, 13 Jul 2017 19:59:40 +0000 (19:59 +0000)]
Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev
Lucas Dupin [Thu, 13 Jul 2017 19:57:40 +0000 (19:57 +0000)]
Merge changes Ie4fd89a3,Ica428dbc,Id3d1e935 into oc-dr1-dev am:
6a6d63be45
am:
b02198da14
Change-Id: I9b8ad92792978bb0eddca3ffe7688f366b95d7e9
Christopher Tate [Thu, 13 Jul 2017 19:56:56 +0000 (19:56 +0000)]
Merge "Tear down agent after preflight rejection" into oc-dr1-dev
am:
47303ec66b
Change-Id: Id831cef2f90ad39537975d31407f00b2f768d59e
Lucas Dupin [Thu, 13 Jul 2017 19:49:59 +0000 (19:49 +0000)]
Merge changes Ie4fd89a3,Ica428dbc,Id3d1e935 into oc-dr1-dev
am:
6a6d63be45
Change-Id: Ia0425e5333b437970786255b0a1e513fedfcf0bd
TreeHugger Robot [Thu, 13 Jul 2017 19:49:28 +0000 (19:49 +0000)]
Merge "Tear down agent after preflight rejection" into oc-dr1-dev
Lucas Dupin [Thu, 13 Jul 2017 19:41:32 +0000 (19:41 +0000)]
Merge changes Ie4fd89a3,Ica428dbc,Id3d1e935 into oc-dr1-dev
* changes:
Check mark color after successful auth
Ripple colors should match sysui theme.
Correct navbar colors after rebooting
Timur Iskhakov [Thu, 13 Jul 2017 19:39:36 +0000 (19:39 +0000)]
Merge "Add configureRpcThreadpool to java interface" am:
d8dab11547 am:
791a698a6a am:
9cdec3943c
am:
1cdcaa8cf3
Change-Id: Iea02cb61c0a77eb3d94b9ebe63687457b6a5032c
Timur Iskhakov [Thu, 13 Jul 2017 19:33:29 +0000 (19:33 +0000)]
Merge "Add configureRpcThreadpool to java interface" am:
d8dab11547 am:
791a698a6a
am:
9cdec3943c
Change-Id: Id3e2523a755e8ce207ac6bd85dbf6d5a69070207
Timur Iskhakov [Thu, 13 Jul 2017 19:27:37 +0000 (19:27 +0000)]
Merge "Add configureRpcThreadpool to java interface" am:
d8dab11547
am:
791a698a6a
Change-Id: I9b98013a894aa01268ed69a14c6b425e04771936
Julia Reynolds [Thu, 13 Jul 2017 19:23:26 +0000 (19:23 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dr1-dev am:
bcc35f5ae6
am:
886d8b1c00
Change-Id: I232b0239d0af7d211cb91496a1b35646864a4032
Timur Iskhakov [Thu, 13 Jul 2017 19:21:42 +0000 (19:21 +0000)]
Merge "Add configureRpcThreadpool to java interface"
am:
d8dab11547
Change-Id: I958ef6fc2d667a691e39e9fadd07303085a499f9
Qingxi Li [Thu, 13 Jul 2017 19:17:03 +0000 (19:17 +0000)]
Merge "Fix the error that the broadcast receiver cannot be registered" into oc-dr1-dev am:
b7febbb727
am:
11ba1cb60a
Change-Id: Iebb4844baf119ae51749aab524184f35c208853d
Julia Reynolds [Thu, 13 Jul 2017 19:15:54 +0000 (19:15 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dr1-dev
am:
bcc35f5ae6
Change-Id: Ifb65c3b9aba091a30f6b895bd2c5f585802cf150
Treehugger Robot [Thu, 13 Jul 2017 19:11:39 +0000 (19:11 +0000)]
Merge "Add configureRpcThreadpool to java interface"
Qingxi Li [Thu, 13 Jul 2017 19:08:27 +0000 (19:08 +0000)]
Merge "Fix the error that the broadcast receiver cannot be registered" into oc-dr1-dev
am:
b7febbb727
Change-Id: Ia16b14971d474bdab739368a83b5b119faeaa381
Bill Yi [Thu, 13 Jul 2017 19:08:04 +0000 (19:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
e210bf7a40 -s ours
am:
e47cc86d69 -s ours
Change-Id: Ia57216e086b55fcf91d31c1b9f075d50e65a61f4
TreeHugger Robot [Thu, 13 Jul 2017 19:04:45 +0000 (19:04 +0000)]
Merge "Add metrics to log performance of different ranker services in ChooserActivity."
TreeHugger Robot [Thu, 13 Jul 2017 19:03:48 +0000 (19:03 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dr1-dev
Qingxi Li [Thu, 13 Jul 2017 19:02:24 +0000 (19:02 +0000)]
Merge "Fix the error that the broadcast receiver cannot be registered" into oc-dr1-dev
Bill Yi [Thu, 13 Jul 2017 19:00:21 +0000 (19:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
e210bf7a40 -s ours
Change-Id: I5ae2c4e17952f0f5ca5cea8255fa2d68647c6dab
Evan Laird [Thu, 13 Jul 2017 18:56:39 +0000 (18:56 +0000)]
Merge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev am:
31ff02ecd2
am:
8154057746
Change-Id: I5296fc15a424ea10f41edb4fc544f711a5d65d6c
TreeHugger Robot [Thu, 13 Jul 2017 18:53:12 +0000 (18:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 18:47:11 +0000 (18:47 +0000)]
Merge "Do not use rotation as indicator to relaunch from config change." into oc-dr1-dev am:
fa62d79a02
am:
b3d51770d1
Change-Id: I267b6be7a95c19b927e8ecb01e597342e6bee1d3
Evan Laird [Thu, 13 Jul 2017 18:45:23 +0000 (18:45 +0000)]
Merge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev
am:
31ff02ecd2
Change-Id: I86b352ed009cf2889974d724a4cf8daf41fb61d7
TreeHugger Robot [Thu, 13 Jul 2017 18:43:13 +0000 (18:43 +0000)]
Merge "Added mediumTest annotation to execute on tradefed."
TreeHugger Robot [Thu, 13 Jul 2017 18:39:39 +0000 (18:39 +0000)]
Merge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 18:34:30 +0000 (18:34 +0000)]
Merge "Do not use rotation as indicator to relaunch from config change." into oc-dr1-dev
am:
fa62d79a02
Change-Id: Iaff54dcb133a4169f70f7ea2d7ded68cc313e946
Bryce Lee [Thu, 13 Jul 2017 18:28:09 +0000 (18:28 +0000)]
Merge "Do not use rotation as indicator to relaunch from config change." into oc-dr1-dev
Fan Zhang [Thu, 13 Jul 2017 18:19:40 +0000 (11:19 -0700)]
Remove duplicate attrs.
The attr is already defined in support lib. We no long need it after
linking symbol tables correctly in build.
Test: builds
Change-Id: Ib5f2ded9315e453937ea5c3769a9a27e59fc4f1e
Paul McLean [Thu, 13 Jul 2017 18:09:17 +0000 (18:09 +0000)]
Merge "More fine-grained exception handling so we can still use non-excepting descriptors." into oc-dr1-dev am:
84a60bf9e8
am:
6899fa6c81
Change-Id: Ic70707c334e9765e7f196bdcb0d2d753ce17b0fb
Selim Cinek [Thu, 13 Jul 2017 18:03:59 +0000 (18:03 +0000)]
Merge "Fixed a bug where status icons were not animating" into oc-dr1-dev am:
c8c121757e
am:
ce58e94a5b
Change-Id: Iefe597271e07e53a9a9b879d62690acbc4fef8cc
Paul McLean [Thu, 13 Jul 2017 18:00:55 +0000 (18:00 +0000)]
Merge "More fine-grained exception handling so we can still use non-excepting descriptors." into oc-dr1-dev
am:
84a60bf9e8
Change-Id: Ica095cfa4d341916fdb3ab1f9948c693c9471733
Nikolas Bravo [Mon, 10 Jul 2017 11:06:34 +0000 (12:06 +0100)]
ProfileSelectDialog no longer removes caller activity from
task.
In Settings, after calling ProfileSelectDialog and choosing a profile,
then going back would go 2 activities back. The issue is that
ProfileSelectDialog was calling finish() in the no-longer-used
SettingsDrawerActivity. This caused the any activity calling the
dialog to be removed from the task, and thus being impossible to
go back to. This call to the drawer is also a code smell.
Bug:
36237246
Fixes:
36237246
Test: NA
Change-Id: I6f309b220ffae1d86e6879ddf6a0305ad3dde3e8
(cherry picked from commit
b975c0e44445f76d67e7576c1e8e08609b696408)
Bryce Lee [Thu, 13 Jul 2017 17:55:05 +0000 (17:55 +0000)]
Merge "Allow max aspect ratio to be specified by meta-data tag." into oc-dr1-dev am:
a926dbf5d2
am:
d0bc21efd5
Change-Id: Idf2bfb1d6c2b70a53ebe46df300be6fe3fce3258
Selim Cinek [Thu, 13 Jul 2017 17:54:13 +0000 (17:54 +0000)]
Merge "Fixed a bug where status icons were not animating" into oc-dr1-dev
am:
c8c121757e
Change-Id: I796e63264ddbba810a1def709594fa73977f50ca
TreeHugger Robot [Thu, 13 Jul 2017 17:48:23 +0000 (17:48 +0000)]
Merge "More fine-grained exception handling so we can still use non-excepting descriptors." into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 17:47:52 +0000 (17:47 +0000)]
Merge "Allow max aspect ratio to be specified by meta-data tag." into oc-dr1-dev
am:
a926dbf5d2
Change-Id: I3f1dd4938ed37af093d326a951b9eb1854e60611
Seigo Nonaka [Fri, 30 Jun 2017 00:50:33 +0000 (17:50 -0700)]
Implement family fallback.
Introduce new attribute "fallbackFor" to font element.
By specifying name of the family to this attribute, that font is used
when the developer specifies the font family.
For example, if fonts.xml has the following family entry,
<family lang="ja">
<font fallbackFor="serif">NotoSerifJP-Regular.ttf</font>
<font>NotoSansJP-Regular.ttf</font>
</family>
the Japanese text is rendered by NotoSansJP-Regular.ttf by default.
Then, if developer specifies fontFamily="serif" in TextView, the Japanese
text is rendered by NotoSerifJP-Regular.ttf.
Bug:
37328609
Bug:
31491668
Test: bit FrameworksCoreTests:android.graphics.TypefaceSystemFallbackTest
Change-Id: I2744db7384c8056795e841c88b387545434131f4
Doris Ling [Fri, 30 Jun 2017 23:04:56 +0000 (16:04 -0700)]
Update the max height/width attribute of the TwoTargetPreference icon.
Change the namespace for the icon image view to settings package.
Change-Id: Id1ffbc1742bedab93c9f03e9d464f532fe2c33af
Fix:
63666970
Test: Visual
(cherry picked from commit
a990b5da04b4f5d475ff038f99d7dd908e931d63)
TreeHugger Robot [Thu, 13 Jul 2017 17:40:44 +0000 (17:40 +0000)]
Merge "Fixed a bug where status icons were not animating" into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 17:38:48 +0000 (17:38 +0000)]
Merge "Allow max aspect ratio to be specified by meta-data tag." into oc-dr1-dev
Lucas Dupin [Thu, 13 Jul 2017 17:19:05 +0000 (17:19 +0000)]
Merge "In-app gradient color based on systemui theme." into oc-dr1-dev am:
717dd58c52
am:
de3597c769
Change-Id: I929d33ba540d03cdd823f0cf9a1b22b365fd9f2f
Lucas Dupin [Thu, 13 Jul 2017 17:09:59 +0000 (17:09 +0000)]
Merge "In-app gradient color based on systemui theme." into oc-dr1-dev
am:
717dd58c52
Change-Id: I35c7baae2e373f4d8bea87d1afc175833de7f59e
Kang Li [Wed, 5 Jul 2017 21:47:32 +0000 (14:47 -0700)]
Add metrics to log performance of different ranker services in
ChooserActivity.
bug:
63353389
Test: tested by GmsCore debug logs.
Change-Id: Iacfef00531953344af190d3bd381c0ea38c37fe2
Lucas Dupin [Thu, 13 Jul 2017 17:03:47 +0000 (17:03 +0000)]
Merge "In-app gradient color based on systemui theme." into oc-dr1-dev
Tenghui Zhu [Thu, 13 Jul 2017 16:46:35 +0000 (16:46 +0000)]
Merge "Update the annotation for getAnimation"
Selim Cinek [Thu, 13 Jul 2017 16:42:24 +0000 (16:42 +0000)]
Merge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev am:
ac77186d34
am:
d4a3ca8d76
Change-Id: I7853e861904dac6a251979dfe841107f9956772d
Selim Cinek [Thu, 13 Jul 2017 16:36:48 +0000 (16:36 +0000)]
Merge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev
am:
ac77186d34
Change-Id: Ia5c6852cce42eb3fe600086c3140266a141bca03
Selim Cinek [Thu, 13 Jul 2017 16:29:21 +0000 (16:29 +0000)]
Merge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev
Bill Yi [Thu, 13 Jul 2017 16:11:39 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
4c44a3059c -s ours
am:
ff5416e5dc -s ours
Change-Id: If46ff7739aae13d118f597f4838c65924ce083f4
Bill Yi [Thu, 13 Jul 2017 16:06:11 +0000 (16:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
4c44a3059c -s ours
Change-Id: I0474490ef308e2df768be086ad76e8aae671891d
TreeHugger Robot [Thu, 13 Jul 2017 16:01:10 +0000 (16:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Fredrik Roubert [Thu, 6 Apr 2017 20:13:51 +0000 (22:13 +0200)]
Update JNI code in preparation for ICU 59 switching to C++11 char16_t.
ICU 59 (update pending on the aosp/icu59 branch) has switched to using
the C++11 char16_t data type, which is a distinct type from uint16_t
(which is what JNI's jchar is typedef'd as), even though they are
bitwise identical.
All code that passes UTF-16 data between ICU4C and JNI must therefore be
updated with typecasts in the appropriate places before ICU 59 is merged
to aosp/master.
Bug:
37554848
Test: Treehugger
Change-Id: Ic84a94be82acbef41f80cc113d5da485ce54ae29
Paul McLean [Tue, 11 Jul 2017 17:18:59 +0000 (11:18 -0600)]
More fine-grained exception handling so we can still use non-excepting descriptors.
Bug:
63655391
Test: Manual - connect various devices and verify the connection state is correct.
Change-Id: Iae6143d2e853e916c8588e0c6f771c00714b3a8a
Bill Yi [Thu, 13 Jul 2017 15:44:05 +0000 (15:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
482b2c3b12 -s ours
am:
b7d1a1fdc7 -s ours
Change-Id: I9ad8713f26221dbd14be8b44741ba236c32223d7
Bill Yi [Thu, 13 Jul 2017 15:39:12 +0000 (15:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
482b2c3b12 -s ours
Change-Id: I943722c47109b65dee52ad67292b14ec53074a24
TreeHugger Robot [Thu, 13 Jul 2017 15:36:34 +0000 (15:36 +0000)]
Merge "IpManager: define InitialConfiguration"
TreeHugger Robot [Thu, 13 Jul 2017 15:31:41 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Selim Cinek [Thu, 13 Jul 2017 15:27:20 +0000 (17:27 +0200)]
Fixed a bug where status icons were not animating
Initializing should be done to true
Test: manual, add animating notification, observe statusbar
Change-Id: I53c7667184b1e9e0d065816982236b9a7b919b6f
Fixes:
63533925
Julia Reynolds [Thu, 13 Jul 2017 15:23:12 +0000 (11:23 -0400)]
Fix nomanservice notificationrecord leak
Test: runtest systemui-notification
Change-Id: Ic5761b917edd000bf73b3291b0ca95bbb0b9bedb
Fixes:
63585648
Tomasz Wasilczyk [Tue, 11 Jul 2017 02:33:22 +0000 (19:33 -0700)]
Publish new Broadcast Radio APIs.
Also, rename FEATURE_RADIO to FEATURE_BROADCASTRADIO.
Bug: b/
34348946
Bug: b/
63405337
Test: instrumentalization
Change-Id: Ibf5851a10b94f9e82db85f740fde6f28efe48666
Selim Cinek [Thu, 13 Jul 2017 13:46:10 +0000 (15:46 +0200)]
Fixed a bug where an incoming call wasn't launching
When the lockscreen isn't showing, but aod is, an incomming
call would not launch its fullscreen intent but show up in
AOD1. In addition was the display completely messed up and
overlapping other parts of the AOD screen.
Test: receive call while in AOD but not locked
Change-Id: Icc3e989167e72289ddcd0a62064526db9004cdc2
Fixes:
62402251
Bill Yi [Thu, 13 Jul 2017 13:42:58 +0000 (06:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0d916ea4bce1d259de0703e12701b534f31178a3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Hugo Benichi [Fri, 23 Jun 2017 01:07:08 +0000 (10:07 +0900)]
IpManager: define InitialConfiguration
This patch adds a InitialConfiguration class to IpManager for specifying
IP information in IpManager ProvisioningConfiguration at IpManager
startup.
At the moment this InitialConfiguration is not used, but is validated in
startProvsiioning if ProvisioningConfiguration includes one. It will be
integrated into IpManager IP provisioning logic in follow-up patches.
This patch also includes an example of data driven unit tests using a
table of test case. The highlights of this methodology are:
1) easy extensibility for new test case,
2) rich and informative error messages,
Unfortunately Java support for inlined data structure literals is poor
and some companion static methods for data generation are required for
enabling this methodology.
Bug:
62988545
Test: added new test in FrameworksNetTests,
$ runtest frameworks-net
$ runtest frameworks-wifi
Change-Id: I060b02603af7d73a6407df89344bf0c000574af2
Adrian Roos [Thu, 13 Jul 2017 12:17:44 +0000 (12:17 +0000)]
Merge "AOD: Implement long press gesture to launch assist" into oc-dr1-dev am:
3fbd93056e
am:
6d626acdbf
Change-Id: Iabff9ca955aef414ad7e62e0c68e2774ff01c9b7
Adrian Roos [Thu, 13 Jul 2017 12:10:21 +0000 (12:10 +0000)]
Merge "AOD: Implement long press gesture to launch assist" into oc-dr1-dev
am:
3fbd93056e
Change-Id: I8bc8e01a97711fdd30ff59aeb72d38e8acaa7c75
Adrian Roos [Thu, 13 Jul 2017 12:01:52 +0000 (12:01 +0000)]
Merge "AOD: Implement long press gesture to launch assist" into oc-dr1-dev
Neil Fuller [Thu, 13 Jul 2017 11:20:35 +0000 (11:20 +0000)]
Merge "Re-enable use of isPrivilegedApp()" am:
bd51de1b20 am:
a5a493cc19 am:
3a6b550753
am:
154eca93e7
Change-Id: Ie8793108595b128a8ec898b4cada98c98a93fb1c
Neil Fuller [Thu, 13 Jul 2017 11:13:09 +0000 (11:13 +0000)]
Merge "Re-enable use of isPrivilegedApp()" am:
bd51de1b20 am:
a5a493cc19
am:
3a6b550753
Change-Id: I0e2e6fa93a4f15023f17efba275c236880863ccd
Neil Fuller [Thu, 13 Jul 2017 11:06:06 +0000 (11:06 +0000)]
Merge "Re-enable use of isPrivilegedApp()" am:
bd51de1b20
am:
a5a493cc19
Change-Id: I633d8e838d559056a331bc81bd5db5f644fa4489
Neil Fuller [Thu, 13 Jul 2017 10:59:41 +0000 (10:59 +0000)]
Merge "Re-enable use of isPrivilegedApp()"
am:
bd51de1b20
Change-Id: I3e41058a76b840dfcd1b5171b8c6688509f1fd7d
Pavel Grafov [Thu, 13 Jul 2017 10:55:11 +0000 (10:55 +0000)]
Merge "Add DPMS test as presubmit test."
Neil Fuller [Thu, 13 Jul 2017 10:50:23 +0000 (10:50 +0000)]
Merge "Re-enable use of isPrivilegedApp()"
Bill Yi [Thu, 13 Jul 2017 10:10:00 +0000 (03:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id63562e9b590d6351469c5d884ebb9e5a24ba195
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Erik Kline [Thu, 13 Jul 2017 09:17:33 +0000 (09:17 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" am:
de837a97aa am:
ae21b89414 am:
17a62281e4 -s ours
am:
00c73c7784 -s ours
Change-Id: Iee7147a3f2a0e968d2154b623f741c738e5a641d
Erik Kline [Thu, 13 Jul 2017 09:12:02 +0000 (09:12 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" am:
de837a97aa am:
ae21b89414
am:
17a62281e4 -s ours
Change-Id: I3242d187a794d9c3fe51f971e9b15edfe55e9ce6
Erik Kline [Thu, 13 Jul 2017 09:07:01 +0000 (09:07 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" am:
de837a97aa
am:
ae21b89414
Change-Id: If96a33f26fed64a84219868d28765b7581ad453d
Erik Kline [Thu, 13 Jul 2017 09:00:56 +0000 (09:00 +0000)]
Merge "Program offload-exempt local prefixes into the HAL"
am:
de837a97aa
Change-Id: I741b6e31fb3adc922f47df824188786ff35e3aa9
Treehugger Robot [Thu, 13 Jul 2017 08:53:05 +0000 (08:53 +0000)]
Merge "Program offload-exempt local prefixes into the HAL"
Robert Berry [Thu, 13 Jul 2017 08:43:02 +0000 (08:43 +0000)]
Merge "Improve logging when restore fails to load Package Manager."
Bill Yi [Thu, 13 Jul 2017 07:50:26 +0000 (00:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife7e581a0b00d66c174680ed4e40ba8ba7fed86b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Erik Kline [Tue, 4 Jul 2017 09:28:11 +0000 (18:28 +0900)]
Program offload-exempt local prefixes into the HAL
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- observed calls to the HAL setLocalPrefixes in tethering log
Bug:
29337859
Bug:
32163131
Merged-In: I3c3bd4ee83ffe86ddbe6a16fbbfa0756bf5064d4
Merged-In: Iaf80e584df458010741401fc1a19e7f6e21923c1
Merged-In: Ifaf23c6179ead9de6ccfcf41e0c203025153167b
(cherry picked from commit
32179ff81511e00aef31e8fda705be3df074ece6)
Change-Id: I65ea833ac6fe7a75ebe546cfa358c4cffdf2de05