293674 Commits

Author SHA1 Message Date
TreeHugger Robot
5fdde6c10f Merge "Import translations. DO NOT MERGE" 2016-10-18 05:47:01 +00:00
Bill Yi
d958623eed Import translations. DO NOT MERGE am: c11e301ca4 -s ours
am: d648bf6c97  -s ours

Change-Id: Ie71321d8f308029a3d856a18d9d6350ef53351b4
2016-10-18 05:46:42 +00:00
Bill Yi
c36373f2c4 Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: a74148ea54  -s ours

Change-Id: I6925457da9d330406fae0505bac1c3369d354320
2016-10-18 05:45:30 +00:00
Bill Yi
f94ea63942 Import translations. DO NOT MERGE
am: 00afe024b9  -s ours

Change-Id: I96cb6689b67a3d3302d0c62feb7e26961db3b371
2016-10-18 05:45:26 +00:00
Bill Yi
bf6671f401 Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: fb27d02b6b  -s ours

Change-Id: Ia04da67d26029ff1e45aa37acb12065636f0b0d3
2016-10-18 05:44:09 +00:00
Bill Yi
29246c2795 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 61058919ca  -s ours

Change-Id: Iedb8a217643556d0f4920d3f076daa65bf3def73
2016-10-18 05:44:05 +00:00
Bill Yi
80fb38bdd7 Import translations. DO NOT MERGE
am: 5a05ce6409  -s ours

Change-Id: I786be47acfb67339f78f9be651b61d40f020218d
2016-10-18 05:44:04 +00:00
Bill Yi
33b11b7822 Import translations. DO NOT MERGE
am: c5a1d40bf1  -s ours

Change-Id: I0362a2d32dfb655560f9e8ae3b9ec583ad45d0e3
2016-10-18 05:44:03 +00:00
Daichi Hirono
9c8e0f1a54 DO NOT MERGE: Fix NullPointerException in MtpManager.
BUG=30152892

Change-Id: I1f4ec361f499510e3ac1635ca5d134b47b6059c3
(cherry picked from commit 28e6112e2f2cef5852b20e53382ea717a5a6cd41)
2016-10-18 14:42:28 +09:00
Bill Yi
28b2f5f023 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: e8dc857c2f  -s ours

Change-Id: Ia4640233c55faaa79050d94e71d48c5301be2904
2016-10-18 05:38:09 +00:00
Bill Yi
d648bf6c97 Import translations. DO NOT MERGE
am: c11e301ca4  -s ours

Change-Id: Ib8f6a4ea48fbe3a95153ee15be71bedd81d1e88c
2016-10-18 05:38:08 +00:00
TreeHugger Robot
61058919ca Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-18 05:34:43 +00:00
TreeHugger Robot
e8dc857c2f Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-18 05:31:41 +00:00
TreeHugger Robot
a74148ea54 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-10-18 05:31:01 +00:00
TreeHugger Robot
fb27d02b6b Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-10-18 05:30:11 +00:00
TreeHugger Robot
baad14bc0c Merge "Import translations. DO NOT MERGE" 2016-10-18 05:28:55 +00:00
Glenn Kasten
be3c30fe68 Merge "LOCAL_CLANG := true is now the default" 2016-10-18 05:10:29 +00: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
Bill Yi
ad231bd2f8 Import translations. DO NOT MERGE
Change-Id: I551e9cc3ac74b6a488f0bcc32da9905b7d313f5f
Auto-generated-cl: translation import
2016-10-17 21:19:36 -07:00
Bill Yi
c5a1d40bf1 Import translations. DO NOT MERGE
Change-Id: I49725d38064efcb1f95e204a0ab805f8f6eed550
Auto-generated-cl: translation import
2016-10-17 21:10:43 -07:00
Bill Yi
71681756e1 Import translations. DO NOT MERGE
Change-Id: Ia5764eea4534ed61b361308ccea95898a33edb14
Auto-generated-cl: translation import
2016-10-17 20:56:00 -07:00
Bill Yi
f092f27565 Import translations. DO NOT MERGE
Change-Id: Ibc75a70edb447dd05164c53649a83f9dd5f1d9fd
Auto-generated-cl: translation import
2016-10-17 19:54:35 -07:00
Svet Ganov
96b9c75cec Validate input for ContentService#setIsSyncable
The syncable parameter value cannot be set to
SYNCABLE_NO_ACCOUNT_ACCESS which is a synthetic state that
is computed but never persisted. It just means that the sync
adapter cannot access the account regardless of its current
syncable state and we want to keep its current syncable state
to start from there once account access is granted.

bug:31794527

Change-Id: I606c4b517977d0b0d3e7ffe753dfd235a875fcd7
2016-10-18 02:51:15 +00:00
TreeHugger Robot
4a648f03c9 Merge "Fixed typo on service name." 2016-10-18 02:22:44 +00:00
George Burgess IV
11ca129c2b Merge "Fix static analyzer warnings." am: ff5c3ad08b am: 1db1a86bba
am: e76253055c

Change-Id: I37be36a86dbab762c64696843916e88f17908251
2016-10-18 01:56:57 +00:00
George Burgess IV
e76253055c Merge "Fix static analyzer warnings." am: ff5c3ad08b
am: 1db1a86bba

Change-Id: Iafed2ab4df7297ed8e3b0b86cafe15af3e1c8823
2016-10-18 01:49:53 +00:00
George Burgess IV
1db1a86bba Merge "Fix static analyzer warnings."
am: ff5c3ad08b

Change-Id: I655fd765cfeae407c070261cfe07ce8b739b06fa
2016-10-18 01:43:24 +00:00
Adam Lesinski
7a37b74d37 Add tests for attribute resolution
- Adds unit tests for attribute resolution. These include
  some test data resource tables and compiled XML files.
- Convert touched files to Google style guide.

Test: make libandroidfw_tests
Change-Id: Ib3a36061dc874de5f6a266b4e82c0a12ef435f23
2016-10-17 18:33:42 -07:00
Treehugger Robot
ff5c3ad08b Merge "Fix static analyzer warnings." 2016-10-18 01:30:55 +00:00
Adam Lesinski
2582465bb4 Fix race with Asset destruction and printing allocation stats
A race could occur when printing the list of Asset allocations for
debugging purposes.

Each Asset object would insert themselves into a global linked list
on construction and remove themselves on destruction. Iterating the list
and the insertion/remove operations all acquire a global lock.

The race occurs after the Asset subclass destructor runs but before the Asset
base class destructor runs, which performs the actual removal from the list.

The vtable of the object being destroyed ends up pointing at the base Asset class'
vtable, and during the iteration of the global list, a pure virtual method is called
leading to an abort, since the wrong vtable is dereferenced.

This change moves the insertion/removal of the Asset object into the global list
to the concrete class, which adds some maintenance overhead but solves the problem.

Bug:31113965
Test: make libandroidfw_tests
Change-Id: I1a620897e5e04a8519ee247883bba0719b1fa6f3
(cherry picked from commit 0358efe4f76f42d9eea91600202a5ab0831d9cef)
2016-10-18 01:27:39 +00:00
Andy Hung
ffe502bd61 Ringtone: clear the MediaPlayer listener upon completion
This breaks a local refcount cycle and allows the Java gc to finalize
the Ringtone and MediaPlayer objects quickly.

Bug: 31811091
Change-Id: I0e5a4a78fdc02cc0c8b7811a1f1a45db3c90a0ff
2016-10-17 18:12:35 -07:00
Jerry Zhang
ee18f66977 Merge changes from topics 'usb_bugfixes', 'usb_bugfixes2'
* changes:
  Revert: Remove the kick from config switches in UsbDeviceManager
  Clean up persistent usb state on boot.
2016-10-18 01:00:09 +00:00
TreeHugger Robot
860297b91a Merge "Clean up use of DisplayContent from WindowState." 2016-10-18 00:50:32 +00:00
Jerry Zhang
2d2346e094 Revert: Remove the kick from config switches in UsbDeviceManager
Test: Manual
Bug: 32197840
Change-Id: Id2e939a57e170fbb4c06e55dc79c5d35ce95486f
2016-10-17 17:41:36 -07:00
Jerry Zhang
a45dac0e83 Clean up persistent usb state on boot.
b/31814300 was fixed, but mtp can still stick around in the
persistent config even after flashing. This block of code
will only run once, but will ensure that mtp is not in
the config after the update.

Bug: 31814300
Test: Manual
Change-Id: Icf02be38c9e1f769412ac963ed6afc14e6092bfb
2016-10-17 17:41:36 -07:00
TreeHugger Robot
047f5a7b4f Merge "Fix race with Asset destruction and printing allocation stats" 2016-10-18 00:25:00 +00:00
Robert Carr
652aae43e6 Un-hide ROTATION_ANIMATION_SEAMLESS.
For N the Camera used ROTATION_ANIMATION_JUMPCUT
which was reinterpreted as seamless rotation if possible.
However this ended up being non ideal in app transition
scenarios where the rotation animation replaces the app
transition. Here we also can't seamlessly rotate, so the
window just suddenly appears with jumpcut. In fact we want
crossfade as a fallback animation and this is what distinguishes
ROTATION_ANIMATION_JUMPCUT and SEAMLESS. The problem was patched
over in N by having double-tap gestures fire camera intents
with a SEAMLESS ActivityOptions.rotationAnimationHint,
but it was too late to un-hide for consumption by apps. While here,
clean up some documentation that doesn't really parse.

Test: Manual, try the RotationAnimation activity in ApiDemos sample.
Bug: 28838855
Bug: 28823590
Change-Id: I17b5e9fa967df8ade0943337cd7b6c3956d3a499
2016-10-17 17:23:09 -07:00
TreeHugger Robot
92b3f5aed7 Merge "force appropriate size" 2016-10-17 23:45:27 +00:00
Michael Kwan
869c283d53 Merge "Fix oversized icons and removed title line limit." into cw-f-dev am: ff2d91fa07
am: 63b3085570

Change-Id: Id4e4d9e57c24280fe968006893910c273d9f556f
2016-10-17 23:31:03 +00:00
Michael Kwan
8721dbb98c Fix oversized icons and removed title line limit. am: e6c38677a4
am: 5079a82337

Change-Id: I5730a6a022a8c07a9b3d378c1b5fbd5f0a345db5
2016-10-17 23:30:15 +00:00
Philip P. Moltmann
8e9652a208 Merge "Clarify which props of USB devices are optional" 2016-10-17 23:27:14 +00:00
Michael Kwan
63b3085570 Merge "Fix oversized icons and removed title line limit." into cw-f-dev
am: ff2d91fa07

Change-Id: If711cf676853dd470fdd1eec2cadbe8a8033df1d
2016-10-17 23:23:46 +00:00
Michael Kwan
5079a82337 Fix oversized icons and removed title line limit.
am: e6c38677a4

Change-Id: Ic97878c26ec49ee4632becfaffcb23d6d329e41e
2016-10-17 23:23:40 +00:00
Michael Kwan
ff2d91fa07 Merge "Fix oversized icons and removed title line limit." into cw-f-dev 2016-10-17 23:14:06 +00:00
Chris Thornton
87cf29314d Merge "Update primary key in VIS sound model database." into nyc-mr1-dev am: c81e1f15d2 am: c6577b1266
am: 5fa6750da2

Change-Id: Iae01991869a25ef66ac5c0a7a7aa578d101f7117
2016-10-17 22:52:09 +00:00
Chris Thornton
a761493245 Update primary key in VIS sound model database. am: 5bd5cf75e1 am: 2d452d7dab
am: 059b78c949

Change-Id: I309ac36fee77039f786ea72830c9da74cd87dfa9
2016-10-17 22:51:11 +00:00
Tyler Gunn
2282bb97e7 Framework fixes to support VoLTE conf calls via RemoteConnectionServices.
Fixing some issues with the addExistingConnection and addConference APIs
on ConnectionService.  When a connection manager relays the addition of
an existing connection or a conference to Telecom, it will assign a new
ID to the new connection/conference.  Due to how RemoteCSes work, the
Connection/Conf will be added directly via TelephonyConnectionService and
also via the connection manager's connection service.  Because the ID
changes, we ended up adding these twice. Conferences weren't a problem in
the GSM conference case because the TElephonyConnectionService's
ConnectionServiceWrapper didn't know of the IDs for the children of the
conference.  However, due to how the existing connections work its not the
case for VoLTE conferences.  To mitigate this, I'm passing the original
connection/conference ID to the connection manager via extras (ugh) and
using this to ensure that when the new existing connection/conference is
added to telecom that the same ID is used.  This ensures that we can
properly de-dupe the requests from TelephonyConnectionService and the
connection manager.

Also, there was some missing code in RemoteConnectionService which would
cause it to not properly track existing connections.

Bug: 31464792
Change-Id: I436f4438fd000ea48ebea7ceb75105bd3f456e46
2016-10-17 15:48:19 -07:00
Chris Thornton
5fa6750da2 Merge "Update primary key in VIS sound model database." into nyc-mr1-dev am: c81e1f15d2
am: c6577b1266

Change-Id: I8ce1dfc713ec15be5b2d9814667a5c04ea4d6780
2016-10-17 22:45:35 +00:00
Chris Thornton
059b78c949 Update primary key in VIS sound model database. am: 5bd5cf75e1
am: 2d452d7dab

Change-Id: I53e9f73caee56f715bdeaf93a680598bc13aee01
2016-10-17 22:44:38 +00:00
Wale Ogunwale
b0f3b836b9 Clean up use of DisplayContent from WindowState.
Follow up to ag/1483993 where WindowTokens can now only be on one display.
Clean-up some existing code that dealt with having WindowTokens on
multiple displays.

Test: Existing tests pass.
Change-Id: Ie908eda37bc44097dea773b0fc163d35cc9baf35
2016-10-17 15:36:50 -07:00