332694 Commits

Author SHA1 Message Date
Timur Iskhakov
221024bead Merge "Add configureRpcThreadpool to java interface" am: d8dab11547 am: 791a698a6a am: 9cdec3943c
am: 1cdcaa8cf3

Change-Id: Iea02cb61c0a77eb3d94b9ebe63687457b6a5032c
2017-07-13 19:39:36 +00:00
Timur Iskhakov
1cdcaa8cf3 Merge "Add configureRpcThreadpool to java interface" am: d8dab11547 am: 791a698a6a
am: 9cdec3943c

Change-Id: Id3e2523a755e8ce207ac6bd85dbf6d5a69070207
2017-07-13 19:33:29 +00:00
Timur Iskhakov
9cdec3943c Merge "Add configureRpcThreadpool to java interface" am: d8dab11547
am: 791a698a6a

Change-Id: I9b98013a894aa01268ed69a14c6b425e04771936
2017-07-13 19:27:37 +00:00
Hugo Benichi
fd31b9d46e 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
Merged-In: I060b02603af7d73a6407df89344bf0c000574af2

(cherry pick of commit 2757fcf3a13b0addc4a168a12c72ac2fc418b012)

Change-Id: I48dbf89232d7758f1b07ed4d76ce93281e5c6b53
2017-07-14 04:26:42 +09:00
Eino-Ville Talvala
19d96a197f CameraManager: Handle camera service being disabled explicitly
Previously, CameraManager handled a disabled camera service
implicitly, the same as it handles a temporarily-crashed camera
service.

However, the error reporting for the those cases isn't really the
same, so switch to being explicit - check for the disabled camera
service system property, and if it's set, short-circuit calls.

Test: Camera CTS continues to pass, Watch device with no camera
      service also now passes camera CTS.
Bug: 62269118

Change-Id: I65a97f8c1b0f101999b2c04d4f1096b7f3aee858
2017-07-13 12:23:51 -07:00
Julia Reynolds
8166d8b2c3 Merge "Fix nomanservice notificationrecord leak" into oc-dr1-dev am: bcc35f5ae6
am: 886d8b1c00

Change-Id: I232b0239d0af7d211cb91496a1b35646864a4032
2017-07-13 19:23:26 +00:00
Timur Iskhakov
791a698a6a Merge "Add configureRpcThreadpool to java interface"
am: d8dab11547

Change-Id: I958ef6fc2d667a691e39e9fadd07303085a499f9
2017-07-13 19:21:42 +00:00
Qingxi Li
02eab5653d Merge "Fix the error that the broadcast receiver cannot be registered" into oc-dr1-dev am: b7febbb727
am: 11ba1cb60a

Change-Id: Iebb4844baf119ae51749aab524184f35c208853d
2017-07-13 19:17:03 +00:00
Julia Reynolds
886d8b1c00 Merge "Fix nomanservice notificationrecord leak" into oc-dr1-dev
am: bcc35f5ae6

Change-Id: Ifb65c3b9aba091a30f6b895bd2c5f585802cf150
2017-07-13 19:15:54 +00:00
Treehugger Robot
d8dab11547 Merge "Add configureRpcThreadpool to java interface" 2017-07-13 19:11:39 +00:00
Qingxi Li
11ba1cb60a Merge "Fix the error that the broadcast receiver cannot be registered" into oc-dr1-dev
am: b7febbb727

Change-Id: Ia16b14971d474bdab739368a83b5b119faeaa381
2017-07-13 19:08:27 +00:00
Bill Yi
f4577598bf Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e210bf7a40 -s ours
am: e47cc86d69  -s ours

Change-Id: Ia57216e086b55fcf91d31c1b9f075d50e65a61f4
2017-07-13 19:08:04 +00:00
TreeHugger Robot
7db6b9778f Merge "Add metrics to log performance of different ranker services in ChooserActivity." 2017-07-13 19:04:45 +00:00
TreeHugger Robot
bcc35f5ae6 Merge "Fix nomanservice notificationrecord leak" into oc-dr1-dev 2017-07-13 19:03:48 +00:00
Qingxi Li
b7febbb727 Merge "Fix the error that the broadcast receiver cannot be registered" into oc-dr1-dev 2017-07-13 19:02:24 +00:00
Bill Yi
e47cc86d69 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: e210bf7a40  -s ours

Change-Id: I5ae2c4e17952f0f5ca5cea8255fa2d68647c6dab
2017-07-13 19:00:21 +00:00
Evan Laird
7f1e7ef499 Merge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev am: 31ff02ecd2
am: 8154057746

Change-Id: I5296fc15a424ea10f41edb4fc544f711a5d65d6c
2017-07-13 18:56:39 +00:00
TreeHugger Robot
e210bf7a40 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-07-13 18:53:12 +00:00
Bryce Lee
8f18579afe Merge "Do not use rotation as indicator to relaunch from config change." into oc-dr1-dev am: fa62d79a02
am: b3d51770d1

Change-Id: I267b6be7a95c19b927e8ecb01e597342e6bee1d3
2017-07-13 18:47:11 +00:00
Evan Laird
8154057746 Merge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev
am: 31ff02ecd2

Change-Id: I86b352ed009cf2889974d724a4cf8daf41fb61d7
2017-07-13 18:45:23 +00:00
TreeHugger Robot
6ea667447d Merge "Added mediumTest annotation to execute on tradefed." 2017-07-13 18:43:13 +00:00
TreeHugger Robot
31ff02ecd2 Merge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev 2017-07-13 18:39:39 +00:00
Bryce Lee
b3d51770d1 Merge "Do not use rotation as indicator to relaunch from config change." into oc-dr1-dev
am: fa62d79a02

Change-Id: Iaff54dcb133a4169f70f7ea2d7ded68cc313e946
2017-07-13 18:34:30 +00:00
Bryce Lee
fa62d79a02 Merge "Do not use rotation as indicator to relaunch from config change." into oc-dr1-dev 2017-07-13 18:28:09 +00:00
Fan Zhang
449d5f7c26 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
2017-07-13 11:19:40 -07:00
Eino-Ville Talvala
31ad8a3dcb CameraServiceProxy: Log camera usage metrics
- Add new events for camera usage by camera facing
- Dump stored camera events into metrics logs
- Shuffle event ordering for privacy
- Limit history to 100 entries at most

Test: Verify event log collection includes camera events
Bug: 32449509
Change-Id: I2e80b84f9bba3691893dca653ac085fef0b6c98c
2017-07-13 11:14:10 -07:00
Eino-Ville Talvala
e91012ba88 CameraServiceProxy: Add CameraStatsLoggingService, event dumping
- Collect camera usage events (facing, client, duration)
- Create a JobService that triggers roughly daily to dump events

Test: Verify that 'adb shell cmd jobscheduler run android 13254266'
   prints out all camera usage since last run
Bug: 32449509
Change-Id: I13172e6e68f5cdb94685a112c74d270d1dda45bf
2017-07-13 11:14:09 -07:00
Roozbeh Pournader
4e5b71f084 Switch file size formatters to use ICU's MeasureFormat
Use ICU's MeasureFormat to the degree possible for formatting file
sizes.

Bug: 36994779
Test: adb shell am instrument -w -e package android.text com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Test: bit CtsTextTestCases:*
Change-Id: I4ad3b568ae7585b6ff56fddb79ded7c5b2118176
2017-07-13 11:11:55 -07:00
Paul McLean
39c9e18721 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
2017-07-13 18:09:17 +00:00
Selim Cinek
e67247af4b Merge "Fixed a bug where status icons were not animating" into oc-dr1-dev am: c8c121757e
am: ce58e94a5b

Change-Id: Iefe597271e07e53a9a9b879d62690acbc4fef8cc
2017-07-13 18:03:59 +00:00
Paul McLean
6899fa6c81 Merge "More fine-grained exception handling so we can still use non-excepting descriptors." into oc-dr1-dev
am: 84a60bf9e8

Change-Id: Ica095cfa4d341916fdb3ab1f9948c693c9471733
2017-07-13 18:00:55 +00:00
Nikolas Bravo
9752ce32ef 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)
2017-07-13 17:59:44 +00:00
Bryce Lee
90ab6ba03f Merge "Allow max aspect ratio to be specified by meta-data tag." into oc-dr1-dev am: a926dbf5d2
am: d0bc21efd5

Change-Id: Idf2bfb1d6c2b70a53ebe46df300be6fe3fce3258
2017-07-13 17:55:05 +00:00
Selim Cinek
ce58e94a5b Merge "Fixed a bug where status icons were not animating" into oc-dr1-dev
am: c8c121757e

Change-Id: I796e63264ddbba810a1def709594fa73977f50ca
2017-07-13 17:54:13 +00:00
TreeHugger Robot
84a60bf9e8 Merge "More fine-grained exception handling so we can still use non-excepting descriptors." into oc-dr1-dev 2017-07-13 17:48:23 +00:00
Bryce Lee
d0bc21efd5 Merge "Allow max aspect ratio to be specified by meta-data tag." into oc-dr1-dev
am: a926dbf5d2

Change-Id: I3f1dd4938ed37af093d326a951b9eb1854e60611
2017-07-13 17:47:52 +00:00
Seigo Nonaka
0d253e46aa 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
2017-07-13 10:47:48 -07:00
Doris Ling
a9fbf3817a 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)
2017-07-13 17:41:24 +00:00
TreeHugger Robot
c8c121757e Merge "Fixed a bug where status icons were not animating" into oc-dr1-dev 2017-07-13 17:40:44 +00:00
Bryce Lee
a926dbf5d2 Merge "Allow max aspect ratio to be specified by meta-data tag." into oc-dr1-dev 2017-07-13 17:38:48 +00:00
Lucas Dupin
c7a0402c6e Merge "In-app gradient color based on systemui theme." into oc-dr1-dev am: 717dd58c52
am: de3597c769

Change-Id: I929d33ba540d03cdd823f0cf9a1b22b365fd9f2f
2017-07-13 17:19:05 +00:00
Lucas Dupin
de3597c769 Merge "In-app gradient color based on systemui theme." into oc-dr1-dev
am: 717dd58c52

Change-Id: I35c7baae2e373f4d8bea87d1afc175833de7f59e
2017-07-13 17:09:59 +00:00
Kang Li
2c57189130 Add metrics to log performance of different ranker services in
ChooserActivity.

bug: 63353389

Test: tested by GmsCore debug logs.

Change-Id: Iacfef00531953344af190d3bd381c0ea38c37fe2
2017-07-13 10:06:08 -07:00
Lucas Dupin
717dd58c52 Merge "In-app gradient color based on systemui theme." into oc-dr1-dev 2017-07-13 17:03:47 +00:00
Tenghui Zhu
cd2d38d65e Merge "Update the annotation for getAnimation" 2017-07-13 16:46:35 +00:00
Selim Cinek
1f6d93a035 Merge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev am: ac77186d34
am: d4a3ca8d76

Change-Id: I7853e861904dac6a251979dfe841107f9956772d
2017-07-13 16:42:24 +00:00
Selim Cinek
d4a3ca8d76 Merge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev
am: ac77186d34

Change-Id: Ia5c6852cce42eb3fe600086c3140266a141bca03
2017-07-13 16:36:48 +00:00
Selim Cinek
ac77186d34 Merge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev 2017-07-13 16:29:21 +00:00
Bill Yi
b6584aeb11 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4c44a3059c -s ours
am: ff5416e5dc  -s ours

Change-Id: If46ff7739aae13d118f597f4838c65924ce083f4
2017-07-13 16:11:39 +00:00
Bill Yi
ff5416e5dc Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 4c44a3059c  -s ours

Change-Id: I0474490ef308e2df768be086ad76e8aae671891d
2017-07-13 16:06:11 +00:00