Commit Graph

252435 Commits

Author SHA1 Message Date
Jakub Pawlowski
8a0a58b218 Merge "Add helper method to convert Bluetooth UUID to bytes" 2016-10-25 21:36:38 +00:00
Jakub Pawlowski
f67ee83a22 Add helper method to convert Bluetooth UUID to bytes
Bug: 30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I7f646d1d357c51b82efc504a0e65d868ad363ddb
2016-10-25 12:30:24 -07:00
Treehugger Robot
836ffa6e1c Merge "Add unit tests for Tethering.isTetherProvisioningRequired" 2016-10-25 18:12:42 +00:00
nharold
88d0a95c74 Merge "Update the docstring on getAllCellInfo() for unreported values" 2016-10-25 00:48:41 +00:00
Christopher Wiley
497c147b82 Add unit tests for Tethering.isTetherProvisioningRequired
Check that we tolerate various dependencies not being available.

Bug: 31946071
Test: These are tests

Change-Id: Ic0a9cd6f255ba9ff4c774dee640df1a0bdf8dc39
2016-10-24 17:07:05 -07:00
Nathan Harold
e327160103 Update the docstring on getAllCellInfo() for unreported values
In the event that not all fields are available for a particular
cell information report, those values are set to
Integer.MAX_VALUE. In addition, this docstring clarifies the
minimum expectation for what will be reported in all cases.

Bug: 32364031
Test: none
Change-Id: Ic5df72f69e5917eb495d349a380ced53a80408fa
2016-10-24 15:59:23 -07:00
Treehugger Robot
aef1a557aa Merge "Allow operator/manufacturer setting to use priority" 2016-10-24 18:21:07 +00:00
Treehugger Robot
a3bb8e3cc7 Merge "PdfEditor: define LOG_TAG" 2016-10-24 15:47:32 +00:00
Treehugger Robot
f741f88284 Merge "Avoid NPE around mReusedTask of ActivityStarter" 2016-10-24 14:09:35 +00:00
Shigeki Yokomichi
0bd28e2c5f Avoid NPE around mReusedTask of ActivityStarter
Symptom:
System crash by NPE is observed on ActivityStarter
during phone boot-up.

Detail and sample:
ActivityStarter has possibility to be called itself recursively
by calling TaskRecord$performClearTaskLocked().
Then class variable of mReusedTask is initialized to null
after the call, because the recursive call isn't guarded by
synchronized block.
Then NPE crash occurs on next statement.

Solutions:
Avoid to use the class variable on null possibility statement.

Bug: 32361138

Change-Id: Iaea3e066a6f7134fcae4338ff864bb236241194c
2016-10-24 13:30:49 +09:00
Treehugger Robot
8be2850546 Merge "Create the WebViewZygote and implement WebViewZygoteInit." 2016-10-22 03:03:10 +00:00
Treehugger Robot
03f14bef41 Merge "Camera2 Legacy: catch more surface abandoned error" 2016-10-21 20:36:29 +00:00
Mark Salyzyn
121ab7001b PdfEditor: define LOG_TAG
general cleanup of logging

Test: compile
Bug: 31992412
Change-Id: Ie2ec5a223bbb92e902bf6914100281b6d84500e3
2016-10-21 13:27:35 -07:00
Yin-Chia Yeh
091661334b Camera2 Legacy: catch more surface abandoned error
Bug: 30140107
Change-Id: Ia293bdbb85c8078e17def55db9c599cfe70458db
2016-10-21 11:40:46 -07:00
Mathieu Chartier
4a5789b9b1 Merge "Fix accounting for .vdex in dumpsys meminfo" 2016-10-21 17:07:37 +00:00
Treehugger Robot
e6fe836938 Merge "fix mistaken check of mScreenBrightnessDarkConfig" 2016-10-21 03:50:16 +00:00
liulvping
d01db540a7 fix mistaken check of mScreenBrightnessDarkConfig
Change-Id: Ibd1234a5a69422f3124e72cd561d4f3624a82faf
Signed-off-by: liulvping <liulvping@xiaomi.com>
2016-10-21 01:59:02 +00:00
Brad Ebinger
37521b9ba5 Merge "Switch on android.telecom.Log in Telecom" 2016-10-20 22:53:39 +00:00
Treehugger Robot
6071abdb92 Merge "Gradually increase the level of authentication on failed GATT operations." 2016-10-20 22:50:07 +00:00
Mathieu Chartier
946ebbcc51 Fix accounting for .vdex in dumpsys meminfo
Before it was showing up in "Other mmap" instead. Now it is correctly
showing up in ".dex mmap".

Bug: 30937355
Test: N6P booting, dumpsys meminfo -d

Change-Id: I335dbb77414b395b14259aa7c68068f845a5eca1
2016-10-20 15:46:08 -07:00
Brad Ebinger
e3daed81eb Merge "Adds registerSessionListener API to Log" 2016-10-20 21:51:53 +00:00
Jacky Cheung
3854e22674 Gradually increase the level of authentication on failed GATT operations.
When lower layer returns insufficient authentication or insufficient
encryption on various GATT operations, gradually retry with increased
authentication level first to AUTHENTICATION_NO_MITM, then
AUTHENTICATION_MITM.

Test: ported from internal branch.

Change-Id: I6bcc4198ca493b7900ddd166a81d30cde896fa86
2016-10-20 13:59:04 -07:00
Treehugger Robot
63b4f6f5db Merge "Fix a static-analyzer warning." 2016-10-20 19:06:58 +00:00
Brad Ebinger
836efade0c Adds registerSessionListener API to Log
Adds the registerSessionListener API to android.telecom.Log to allow
callbacks to occur when a session has been fully completed.
CP from internal branch.

Test: Manual Testing
Bug: 26571395
Change-Id: I70ebd6f432768a5d7bd8f3a0997b8e0ef335bb35
2016-10-19 14:32:46 -07:00
Andreas Huber
2202b164d8 Merge "HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on" 2016-10-19 19:30:29 +00:00
Treehugger Robot
239df3cc5a Merge "Use this.isUp() inside InterfaceConfiguration" 2016-10-19 19:15:31 +00:00
Jason Monk
03e4eb32fe Merge "Hide QS customizer correctly" 2016-10-19 15:05:41 +00:00
Brad Ebinger
42598f4a96 Merge "Add support for new SessionManager and EventManager tests" 2016-10-18 21:22:19 +00:00
Andreas Huber
ef1a565bd4 HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on
HwParcel now reflect this change.

Bug: 32237331
Test: hidl_test_java
Change-Id: Ia1ce5a4e3acedd8ebcff15107aea53ce28fde589
2016-10-18 09:36:02 -07:00
Yoshinori Hirano
1dd7d07460 Hide QS customizer correctly
When users open and close QS customizer quickly, QSCustomizer#hide()
is not called because QSCustomizer#isCustomizing() returns false.
The isCustomizing() becomes true when the expand animation ends.
The hide() should be called even though the animation is ongoing.

Bug: 30545089
Test: manual - open and close QS customizer quickly

Change-Id: Ic483addfb6ae9da31c997fec7778e5acd718c353
2016-10-18 04:31:47 +00:00
Treehugger Robot
ff5c3ad08b Merge "Fix static analyzer warnings." 2016-10-18 01:30:55 +00:00
Treehugger Robot
9cff57312d Merge "Remove APIs that are not directly usable." 2016-10-17 21:16:22 +00:00
Treehugger Robot
78929f3ee0 Merge "missing includes" 2016-10-17 21:12:08 +00:00
Sanket Agarwal
fb6322425a Remove APIs that are not directly usable.
The right way to expose this API is done via MediaBrowser.

Bug: b/28791287
Change-Id: I0a8a185934fd7aaa9f2b5eac7398955fa380060f
(cherry picked from commit b5fbb75aa2)
2016-10-17 12:47:10 -07:00
Mark Salyzyn
4d6c372eae missing includes
Assumptions are made about header side effects

Test: compile
Bug: 30465923
Change-Id: Icc9415aed5e54b2bc00b70aa0da6df4148f30654
2016-10-17 12:32:54 -07:00
Christopher Wiley
87100cce39 Use this.isUp() inside InterfaceConfiguration
Bug: 31337216
Test: Compiles
Change-Id: I968a739f9ada47b1357932d2da76451eb26c3d5f
2016-10-17 10:32:40 -07:00
Treehugger Robot
9a904d68c7 Merge "Avoid automatically mirroring Drawable of CustomTile" 2016-10-17 16:42:18 +00:00
Treehugger Robot
c7ea99a63c Merge "Add InterfaceConfiguration.isUp()" 2016-10-17 16:30:44 +00:00
Treehugger Robot
143d13ce59 Merge "Update time_zones_by_country.xml / delete unused files" 2016-10-17 16:21:59 +00:00
Treehugger Robot
09dcaf1948 Merge "[ActivityManager] Fix the inconsistence between ProcessRecord and BroadcastQueues" 2016-10-17 15:59:17 +00:00
Neil Fuller
50e9b8620c Update time_zones_by_country.xml / delete unused files
preferred_time_zones.xml is not referenced in any code and has been
deleted here.

TimeUtilsTest.java is broken / out of date and semi-duplicates code
in android.util.cts.TimeUtilsTest. It has been deleted here.

time_zones_by_country.xml file has not been updated since (at least)
2009.

Ideally this information would be updated as needed when the
timezone rule data is updated on device. This change just brings the
data up to date without addressing that issue. Given the apparent,
non-obvious, ordering requirements it may not be possible to use
zone1970.tab data directly.

---------------

Impact assessment:

At the time of writing time_zones_by_country.xml is used from:

Non-public methods:

android.util.TimeUtils.getTimeZones(String)

Public methods:

android.util.TimeUtils.getTimeZone(int, boolean, long, String)
android.util.TimeUtils.getTimeZonesWithUniqueOffsets(String)

Therefore there is some app / user benefit from updating it.

Within the framework, this affects:

telephony.ServiceStateTracker - in some circumstances when receiving
offset information from cell networks when better information is not
available.

There is some clockwork code affected that uses the calls for similar
purposes.

---------------

Notes on file formats / mapping the IANA source data:

The updated data was sourced from the IANA tzdata 2016g file
called zone1970.tab. The time_zones_by_country.xml file was manually
edited in a text editor using criteria detailed below.

The zone1970.tab file maps country codes (column 1) to a zone ID
(column 3). A country can be mapped to multiple zones. The zone.tab file
that was likely used in the past is similar in content and format. See
the zone.tab file header for details of the differences.

The time_zones_by_country.xml can have multiple entries for each
country, starting with a comment.

Comments exist for each (Country, Offset) pair. The name is
free-text, the offset is a non-DST offset for a zone as of 14th Oct
2016 using the 2016g data.

<!-- {Country name}, {offset from UTC} -->

Countries are listed in ASCII ascending order of the country code.

Within each country offsets are mostly ordered east to
west. An exception appears to be Australia. The data may have a
secondary order of "best match" (e.g. maybe by population). This might
be important for getTimeZone(int, boolean, long, String)) since it
returns the first match for a given offset, dst, country.

The timezone offset, transition information itself (offset, dst) is
pulled from the timezone rules data on the device, not this file.

The data is encoded for each (Country, Offset) pair by a sequence
of:

<timezone code="xx">{Olson ID}</timezone>

xx is the country code from column 1 in the zone1970.tab file, the
element content is the zone ID from column 3.

---------------

Notes on the changes made to time_zones_by_country.xml:

There are various changes in this commit associated with switching from
zone.tab to zone1970.tab as a data source: zone.tab uses different
Olson IDs due to the different criteria used by these files.
The offset in each case will be the same so will have no practical
effect on offsets / zone detection, though will affect the exemplar
location for the zone found.

The remaining changes reflect actual zone / offset changes that
have occurred.

When adding new zones or rearranging existing ones they have been
positioned so as not to modify the first zone for each country or
the first zone per offset because of the uncertainty about the
secondary ordering. This is to avoid the risk of now picking a
different zone for a country or {country + dst + offset}. This
has resulted in a couple of places where the ordering is
non-intuitive.

The zone names and the offset information contained in the comments was
checked semi-manually using other 2016g data, i.e. the base offset of
each zone was checked against output from a script that created a
TimeZone object from each Olson ID in the file and output the raw
(non-DST) offset.

---------------

Change specifics:

Changes made due to zone1970.tab vs zone.tab:

ANTIGUA AND BARBUDA
ANGUILLA
ANGOLA
ALAND ISLANDS
ARUBA
BOSNIA AND HERZEGOVINA
BURKINA FASO
BAHRAIN
BENIN
BOTSWANA
CONGO
CENTRAL AFRICAN REPUBLIC
CONGO
CAMEROON
DJIBOUTI
DOMINICA
ERITREA
ETHIOPIA
GABON
GRENADA
GUERNSEY
GAMBIA
GUINEA
GUADELOUPE
EQUATORIAL GUINEA
CROATIA
ISLE OF MAN
JERSEY
CAMBODIA
COMOROS
SAINT KITTS AND NEVIS
KUWAIT
CAYMAN ISLANDS
LAO PEOPLE'S DEMOCRATIC REPUBLIC
SAINT LUCIA
LIECHTENSTEIN
LESOTHO
MONTENEGRO
MADAGASCAR
MACEDONIA
MALI
NORTHERN MARIANA ISLANDS
MAURITANIA
MONTSERRAT
MALAWI
NIGER
OMAN
RWANDA
SAINT HELENA
SLOVENIA
SVALBARD AND JAN MAYEN
SLOVAKIA
SIERRA LEONE
SAN MARINO
SENEGAL
SOMALIA
SAO TOME AND PRINCIPE
SWAZILAND
TOGO
TANZANIA
UGANDA
UNITED STATES MINOR OUTLYING ISLANDS
HOLY SEE
SAINT VINCENT AND THE GRENADINES
VIRGIN ISLANDS
YEMEN
MAYOTTE
ZAMBIA
ZIMBABWE

---------

Changes due to new data:

ANTARCTICA
ARGENTINA
AUSTRALIA
BRAZIL
CANADA
CHINA
MICRONESIA
INDIA
MYANMAR
MEXICO
PAPUA NEW GUINEA
PALESTINE
RUSSIAN FEDERATION
UNITED STATES
UKRAINE

---------

Removal of NETHERLANDS ANTILLES (country code "an"):

"an" no longer present in the IANA data.
The country code is no longer in use.
https://en.wikipedia.org/wiki/ISO_3166-2:AN
New country entries for:

Saint Barthélemy
Caribbean Netherlands
Curaçao
Collectivity of Saint Martin
Sint Maarten

---------
Changes due to new data *and* with differences between zone1970.tab
and zone.tab:

GERMANY
South Sudan (entirely new)
VIET NAM
FRENCH SOUTHERN TERRITORIES

---------

Changes to comments or arrangement of existing entries due to non-DST
offset changes since the last update:

Antarctica/Mawson
Europe/Minsk
America/Resolute
Atlantic/Stanley
Asia/Pyongyang
America/Cancun
America/Grand_Turk
Pacific/Fakaofo
Europe/Istanbul
America/Caracas
Pacific/Apia

Bug: 25338903
Test: Build / CtsUtilTestCases
Change-Id: I87e3db795f55ddd92e7402459c5e97aa70b9301e
2016-10-17 12:14:50 +00:00
Yoshinori Hirano
eb09362c72 Avoid automatically mirroring Drawable of CustomTile
Developers of custom tiles should decide whether
the Drawable of their own tiles should be automatically mirrored.
So State#autoMirrorDrawable should be false by default.

Bug: 30930145
Test: manual - change to RTL language and open Quick Settings

Change-Id: Ia3fd8c2aeddb4a27b9ecfaaf52edbcce01fd7f48
2016-10-17 20:04:16 +09:00
yangzhenyu
d509bc93e6 [ActivityManager] Fix the inconsistence between ProcessRecord and BroadcastQueues
Symptom:
Even though one process is executing one BroadcastReceiver,
it may be killed as one EMPTY process occasionally

Detail and sample:
https://code.google.com/p/android/issues/detail?id=221524

Root cause:
app.curReceiver can only remember the last running.
If an application is both receiving FG and BG broadcast,
when one is finished, app.curReceiver becomes null,
the state of application becomes EMPTY.

Solution:
save all running receivers at ProcessRecord

Change-Id: I01b8813af652a8c434be7de0678dc06f99831ae0
Signed-off-by: yangzhenyu <yangzhenyu@xiaomi.com>
2016-10-17 13:58:17 +08:00
Treehugger Robot
2fbf30d3fe Merge "Fix static-analyzer warning." 2016-10-14 02:21:10 +00:00
Treehugger Robot
3ef0315eb7 Merge "Fix Bluetooth OOB pairing not working for unseen devices" 2016-10-14 01:25:11 +00:00
George Burgess IV
56f5f7b79b Fix a static-analyzer warning.
frameworks/base/tools/aapt2/util/Files.cpp:81:21: warning: Null pointer
passed as an argument to a 'nonnull' parameter
     while ((entry = readdir(dir))) {

Bug: None.
Test: Warning no longer appears.
Change-Id: If242598405e995928378ce317a2e909654e1e985
2016-10-13 15:52:34 -07:00
George Burgess IV
0c2774b16a Fix static-analyzer warning.
frameworks/base/tools/aapt/Images.cpp:845:17: warning: Assigned value is
garbage or undefined
     row += bpp;

Bug: None.
Test: The warning is gone.
Change-Id: Idf4623d2510111a9188ed39922e109a8db225c76
2016-10-13 15:51:04 -07:00
George Burgess IV
e8efec56f0 Fix static analyzer warnings.
frameworks/base/libs/androidfw/ResourceTypes.cpp:742:46: warning: Result
of 'calloc' is converted to a pointer of type 'char16_t *', which is
incompatible with sizeof operand type 'char16_t **'
    mCache = (char16_t**)calloc(mHeader->stringCount,
        sizeof(char16_t**));

frameworks/base/libs/androidfw/ResourceTypes.cpp:4359:28: warning:
Potential leak of memory pointed to by 'set'
     return NO_MEMORY;

Bug: None
Test: Builds without the aforementioned warnings.
Change-Id: I1f84c1b9f4cba05f5cc7c3ae9fec1a07bc9cd8fe
2016-10-13 15:32:33 -07:00
Brad Ebinger
096d2829ed Add support for new SessionManager and EventManager tests
Test: Ran new unit tests
Bug: 26571395
Change-Id: I6d14d7c05b8fdc8dc1319a81f0e41f7bcd989b85
2016-10-13 15:26:58 -07:00
Svetoslav Ganov
c98b34bdce Merge "Allow SetupWizard to do WiFi scans if location off" 2016-10-13 20:06:38 +00:00