Commit Graph

76102 Commits

Author SHA1 Message Date
Jean-Michel Trivi
900699c173 Merge "Merge "Fix alarm preview volume" into oc-mr1-dev am: b9629cd432" into oc-mr1-dev-plus-aosp
am: fd77afd548

Change-Id: I9ed6b346f9f81a338169628d9e2c955421560744
2017-10-11 22:28:57 +00:00
Jean-Michel Trivi
47aa351692 Merge "Fix alarm preview volume" into oc-mr1-dev
am: b9629cd432

Change-Id: If5bc5bbdb5239609db61e4706c6b2395b0231f83
2017-10-11 21:48:00 +00:00
TreeHugger Robot
f65d166959 Merge "Removed remaining use of static stack ids." 2017-10-11 21:27:05 +00:00
TreeHugger Robot
b9629cd432 Merge "Fix alarm preview volume" into oc-mr1-dev 2017-10-11 21:19:54 +00:00
Felipe Leme
b147de882a Merge "Document how to handle save on multi-steps activity." into oc-mr1-dev am: a4dffa032b
am: 705d318485

Change-Id: I75ff776435f53c8aed5731dfe984813af48c760a
2017-10-11 20:20:09 +00:00
Felipe Leme
705d318485 Merge "Document how to handle save on multi-steps activity." into oc-mr1-dev
am: a4dffa032b

Change-Id: I01afae63e1fa5503104244c2e78dfb589697a467
2017-10-11 19:43:34 +00:00
TreeHugger Robot
a4dffa032b Merge "Document how to handle save on multi-steps activity." into oc-mr1-dev 2017-10-11 19:34:45 +00:00
TreeHugger Robot
7c3c3c8bf8 Merge "Expose API for heavy-weight apps and get it working again." 2017-10-11 18:36:06 +00:00
Android Build Merger (Role)
f1dd657edf Merge "Canonicalize notification channel sounds for backup am: 2d7a4a3f67 am: 4229c3fcbd" 2017-10-11 18:01:29 +00:00
TreeHugger Robot
93af341d5e Merge "Deprecate view drawing cache" 2017-10-11 18:00:00 +00:00
Bernardo Rufino
68a365fe55 Canonicalize notification channel sounds for backup am: 2d7a4a3f67
am: 4229c3fcbd

Change-Id: Ie900b1e7a613e6e7d94cd5c3224954f71fdd1a5d
2017-10-11 17:59:17 +00:00
TreeHugger Robot
b34b70b067 Merge "incidentd: Dumping batterystats system data to proto." 2017-10-11 17:56:34 +00:00
Bernardo Rufino
4229c3fcbd Canonicalize notification channel sounds for backup
am: 2d7a4a3f67

Change-Id: I47c5aba70bd6713f5cd2432b1141d0772fa1e672
2017-10-11 17:50:06 +00:00
Felipe Leme
ed7796f302 Document how to handle save on multi-steps activity.
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML
Fixes: 67650364

Change-Id: Ib9e6c63e537b47a0670fe6bdf5163e8ab80eef0c
2017-10-11 10:13:15 -07:00
Wale Ogunwale
44f036fd5a Removed remaining use of static stack ids.
Replace by windowingMode and activityType.

Test: Existing tests pass.
Test: go/wm-smoke
Bug: 64146578
Change-Id: I2ff026de3ead1a3e7136df17c68ed37d7aae5495
2017-10-11 07:40:46 -07:00
Bernardo Rufino
2d7a4a3f67 Canonicalize notification channel sounds for backup
Canonicalize for backup and canonicalize and uncanonicalize for restore
(see comment).

Test: Set custom notification sound, make backup, remove notification
sound from device (from Ringtones and make sure to update media content
provider), restore => Observe default instead of random number. Do the
same without removing the sound and observe restores successfully.
Test: runtest systemui-notification
Bug: 66444697

(cherry picked from commit c27bb6ad34)

Change-Id: I32c186d0d7479b01f6cc67cce9bc5cb66264a064
2017-10-11 15:22:32 +01:00
Charles He
e7a7a29d2e Merge "StatusBar: add DISABLE2_GLOBAL_ACTIONS." 2017-10-11 08:07:21 +00:00
Siyamed Sinir
2d729d55aa Merge "Removed unused variables from text layout code" 2017-10-11 02:20:27 +00:00
Jean-Michel Trivi
d51d398383 Fix alarm preview volume
SeekBarVolumizer: do not use FLAG_BYPASS_INTERRUPTION_POLICY as
 there is no need to bypass DnD modes in seek bar for volume
 since they are disabled according to the DnD mode.
AudioService (PlaybackActivityMonitor): check both
 AudioAttributes flags BYPASS_INTERRUPTION_POLICY and
 BYPASS_MUTE for forced alarm playback (see b/63617557).

Test: see bug
Bug: 67578783
Change-Id: Iaf43f16d96d1ad8a1eacc73a050db767004ba96b
2017-10-10 18:13:18 -07:00
Dianne Hackborn
70c95c5674 Expose API for heavy-weight apps and get it working again.
Still very rough UI, but basically does what is intended.
Also add two tests apps for manual tests (CTS test will
be coming).

Bug: 63937884
Test: manual

Change-Id: I45a6a2b122a75f8125510a2027bb1faf57c6956d
2017-10-10 17:57:22 -07:00
TreeHugger Robot
c6ee8d68dc Merge "UID mapping to provide app name and version." 2017-10-10 23:31:48 +00:00
TreeHugger Robot
b6777755ec Merge "Document job scheduler wakelock policy" 2017-10-10 23:19:45 +00:00
TreeHugger Robot
a30e82213b Merge "Remove nGetWidths and pass the jfloat[] as nComputeLineBreaks argument." 2017-10-10 22:50:00 +00:00
Hyunyoung Song
a91a0c5dc4 Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e" into oc-mr1-dev am: 384689934d
am: 3702ce391d

Change-Id: I2ca8d4fb271245e3fc9b7f406456e3dc54dd96cd
2017-10-10 22:42:02 +00:00
Hyunyoung Song
3702ce391d Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e" into oc-mr1-dev
am: 384689934d

Change-Id: Id4885fe270e24d54830d6858e37487de551a3f52
2017-10-10 22:30:23 +00:00
TreeHugger Robot
384689934d Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e" into oc-mr1-dev 2017-10-10 22:22:38 +00:00
David Chen
de70169109 UID mapping to provide app name and version.
The UID map is updated by StatsCompanionService, which listens to broadcast
updates indicating that an app was updated/installed or removed. Also,
the entire map is updated when statsd first connects to the companion
service. Also, there is a way for metrics producers to subscribe to
updates, so that they can know when an app was upgraded.

Test: Created new unit-test for mapping and manually tested for install
and remove. Did not manually test the app upgrade.

Change-Id: I6676ae5c93b75c72d9badabb36aa9c40006db07d
2017-10-10 14:33:23 -07:00
Christopher Tate
6818d367a9 Document job scheduler wakelock policy
And clarify some other descriptions, particularly getAllPendingJobs().

Bug: 19536175
Test: m offline-sdk-docs
Change-Id: I769eb8eb7bdca77f6f143c0d18a3beccc183d5dc
2017-10-10 14:07:43 -07:00
Seigo Nonaka
2dd1a55b41 Remove nGetWidths and pass the jfloat[] as nComputeLineBreaks argument.
nGetWidths was always called just before nComputeLineBreaks. It would be
an improvement to pass the result array as the argument of
nComputeLineBreaks.

Bug: 65024629
Test: bit FrameworksCoreTests:android.text.StaticLayoutLineBreakingTest
Test: bit CtsTextTestCase:*
Test: Manually checked no regression in TextViewOnMeasurePerfTest
Test: Manually checked no regression in StaticLayoutPerfTest result
Change-Id: I566be66558a22b3a3ff79d502bebbbfec75dd065
2017-10-10 20:44:47 +00:00
Charles He
9851a8da99 StatusBar: add DISABLE2_GLOBAL_ACTIONS.
We add a new StatusBarManager flag to disable the global actions dialog
(a.k.a. the power button menu), which is required in certain kiosk mode
scenarios.

Bug: 65813398
Test: runtest systemui
Test: manual, by using a modified version of TestDPC and
      DevicePolicyManagerService

Change-Id: Ib7da2f4837281e98e558afcc30be8bae6f2e179a
2017-10-10 21:04:42 +01:00
Charles He
af60534c97 Merge "Add user restriction to suppress error dialogs." 2017-10-10 19:45:12 +00:00
Hyunyoung Song
dc92d925d8 Wrap StackOverflowError in NotFoundException.
Bug: 67462465
Test: builds and tested using faulty apk with recursive drawable.
Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e
2017-10-10 12:41:05 -07:00
Siyamed Sinir
a273a70ecb Removed unused variables from text layout code
Test: None
Change-Id: I890c3d260edd0570259db5089dcb37f79c2e56e9
2017-10-10 12:40:47 -07:00
Andreas Gampe
e2ce9017cd Merge "Parcel: Avoid NPE in finalization" am: b085deece9 am: cb34bdf55c am: 7934a7f828
am: 77de886b55

Change-Id: If5a797b8780765be8cc658d1e09bf4dea69dd923
2017-10-10 18:18:17 +00:00
Andreas Gampe
77de886b55 Merge "Parcel: Avoid NPE in finalization" am: b085deece9 am: cb34bdf55c
am: 7934a7f828

Change-Id: I5c2819892170855c4d009261785f9e8d26f9ad5e
2017-10-10 18:01:22 +00:00
Andreas Gampe
7934a7f828 Merge "Parcel: Avoid NPE in finalization" am: b085deece9
am: cb34bdf55c

Change-Id: Idd444cd9dfe78d4200f67a4fe6b3c4fb13767f29
2017-10-10 17:52:50 +00:00
TreeHugger Robot
faa5840f06 Merge "Move mPermissionTrees to permission settings" 2017-10-10 17:49:18 +00:00
Andreas Gampe
cb34bdf55c Merge "Parcel: Avoid NPE in finalization"
am: b085deece9

Change-Id: I646baf55627a3874a10775846458af5f1dcd5d8c
2017-10-10 17:35:55 +00:00
Andrew Solovay
056dd6aace Merge "docs: Tiny usage fix ("e-mail" -> "email")" into oc-mr1-dev am: c4a0b34248
am: 81643c09cc

Change-Id: Ib935716cec8ae54f83f6ad85604f97e9982cd14b
2017-10-10 16:51:15 +00:00
Andrew Solovay
81643c09cc Merge "docs: Tiny usage fix ("e-mail" -> "email")" into oc-mr1-dev
am: c4a0b34248

Change-Id: I96c464236f694b194e9f5a6aba68b40ad840035d
2017-10-10 16:42:31 +00:00
Andreas Gampe
009b852133 Parcel: Avoid NPE in finalization
Check whether the guard is null to avoid:

 Uncaught exception thrown by finalizer
 java.lang.NullPointerException: Attempt to invoke virtual method 'void dalvik.system.CloseGuard.close()' on a null object reference
      at android.os.ParcelFileDescriptor.closeWithStatus(ParcelFileDescriptor.java:740)
      at android.os.ParcelFileDescriptor.finalize(ParcelFileDescriptor.java:990)
      at java.lang.Daemons$FinalizerDaemon.doFinalize(Daemons.java:250)
      at java.lang.Daemons$FinalizerDaemon.runInternal(Daemons.java:237)
      at java.lang.Daemons$Daemon.run(Daemons.java:103)
      at java.lang.Thread.run(Thread.java:764)

Follow-up to commit da5a3e12f4.

Bug: 7426029
Bug: 10330121
Test: m
Change-Id: I903f1545ab784008727ff23bb95fe182bd95b62a
2017-10-10 08:06:42 -07:00
Hugo Benichi
7472b72d4d Merge "LinkProperties: fix some indentation issues" am: a162726df7 am: e3b6b636cf am: a63788076a
am: 944e080c22

Change-Id: I0902027750cc797c950ed375832dcc379bbdb93b
2017-10-10 14:42:24 +00:00
Hugo Benichi
944e080c22 Merge "LinkProperties: fix some indentation issues" am: a162726df7 am: e3b6b636cf
am: a63788076a

Change-Id: Ife901fd1c9c30b3864ddce61326f2d5caacd0bae
2017-10-10 14:31:48 +00:00
Hugo Benichi
a63788076a Merge "LinkProperties: fix some indentation issues" am: a162726df7
am: e3b6b636cf

Change-Id: I8c639ddce8408d302f0aede2490d226ca9c4bd8c
2017-10-10 14:21:57 +00:00
Hugo Benichi
e3b6b636cf Merge "LinkProperties: fix some indentation issues"
am: a162726df7

Change-Id: If9bc7cf980aa14880dbf6cc43bc86cc269d306cb
2017-10-10 14:13:45 +00:00
Treehugger Robot
a162726df7 Merge "LinkProperties: fix some indentation issues" 2017-10-10 14:02:35 +00:00
Hugo Benichi
bd87a3934c LinkProperties: fix some indentation issues
Test: no functional change
Change-Id: I469bba154feb382156e56043d83f066a5bd658aa
2017-10-10 18:25:50 +09:00
Andrew Solovay
ab8ea9ff01 docs: Tiny usage fix ("e-mail" -> "email")
I needed to make an edit in this branch to verify part of our docs
process, so I found a Javadoc typo to fix. No code error, just took
out the hyphen in "e-mail" in a Javadoc comment.

Test: make ds-docs
Bug: 67515954
Change-Id: Icb9b2a9df0d7dfd697050735886adec80bc92ff8
2017-10-09 18:49:41 -07:00
John Reck
949cfe1018 Deprecate view drawing cache
Test: Looked at docs

Change-Id: I95a487d126bd15a4085e777d58c60b6342ee64a8
2017-10-09 16:10:37 -07:00
Kweku Adams
87b19ecf9b incidentd: Dumping batterystats system data to proto.
Also a little code cleanup as I was going through to understand the
dumping code.

Bug: 65750808
Test: flash device and inspect incident.proto output
Change-Id: Ib850db408c98d6a96dc028296e96c75087258904
2017-10-09 14:29:40 -07:00