Commit Graph

75200 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Andreas Gampe
cb34bdf55c Merge "Parcel: Avoid NPE in finalization"
am: b085deece9

Change-Id: I646baf55627a3874a10775846458af5f1dcd5d8c
2017-10-10 17:35:55 +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
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
Andrew Sapperstein
31c0be94ef Merge "Update ANOMALY_DETECTION_CONSTANTS javadoc." into oc-mr1-dev
am: 972446cf03

Change-Id: I74706c0f8f2369ff06dc6d9d1d588845edd467b4
2017-10-07 00:37:06 +00:00
TreeHugger Robot
972446cf03 Merge "Update ANOMALY_DETECTION_CONSTANTS javadoc." into oc-mr1-dev 2017-10-07 00:25:13 +00:00
rongliu
d6230d3d2a Merge "Add comment about flag VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL as recommended." into oc-mr1-dev
am: bf070a35cd

Change-Id: I88f24ed82459b4cbc03c92a96774636a47509715
2017-10-06 23:42:27 +00:00
Andrew Sapperstein
858a4640f3 Update ANOMALY_DETECTION_CONSTANTS javadoc.
Adds more of the supported parameters including the new
wakeup blacklist parameter.

Bug: 67000019
Test: is comment change
Change-Id: Iee80b5cbf7972860e87efd5551bce962a3fa03c5
2017-10-06 14:26:08 -07:00
rongliu
3e9f972fde Add comment about flag VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL
as recommended.

Change-Id: I3778eed6f91e3ebf70683f40389c605648444b99
Bug: 67420451
Test: Only add comment.
2017-10-06 11:20:51 -07:00
rongliu
25b1093844 Merge "Add a flag to virtual display to indicates that content on this display need to be destroyed once the display is removed. Then apply this flag to VR virtual display." into oc-mr1-dev
am: 27378c64c7

Change-Id: I45b685d99da325c627bf3f01b9038ddf81c781a1
2017-10-06 14:57:36 +00:00
TreeHugger Robot
27378c64c7 Merge "Add a flag to virtual display to indicates that content on this display need to be destroyed once the display is removed. Then apply this flag to VR virtual display." into oc-mr1-dev 2017-10-06 14:38:42 +00:00
Mike Ma
8cb8bdf657 Merge "Add AOD metrics in batterystats" into oc-mr1-dev
am: 6204a60c53

Change-Id: Ife567f987a1585cb1108725db6ad63516a8dc67a
2017-10-06 07:17:25 +00:00
Mike Ma
6204a60c53 Merge "Add AOD metrics in batterystats" into oc-mr1-dev 2017-10-06 07:01:36 +00:00
Mike Ma
1ce1d3a42c Add AOD metrics in batterystats
Fixes: 64899521
Test: manual - flash build, reset batteryStats, use device > 1 hr
with alternating pattern between screen on/off/AOD. Dump stats, check
all screen related stats look normal, esp. record matches actual time
spent in each screen state. In raw bugreport:
Search "amount discharged" for % discharge;
Search "Screen on/off/doze discharge" for mAh discharge;
Search "time on battery" for up/real time in each state.

Test: Added two unit tests for note AOD screen state

Merged-In: I7193a36751124dd380818b2b665303c0f0d8c984
Change-Id: I51cead7f92abd9e4c620f7dfde393993cdad494e
2017-10-06 00:50:03 +00:00
Ruben Brunk
3de064f7cc Merge "Bind VR compositor service from VrManagerService." into oc-mr1-dev
am: c765c2c448

Change-Id: I868d30cae1181efc90d41d3a2fea33baa503ff0a
2017-10-05 04:03:03 +00:00
TreeHugger Robot
c765c2c448 Merge "Bind VR compositor service from VrManagerService." into oc-mr1-dev 2017-10-05 03:53:44 +00:00
nharold
95d36dd165 Merge "Cosmetic Cleanups for IpSecService" am: 5ade9a228d am: 0bdb9a6e00
am: cc51ef0a47

Change-Id: I0a9c52ca26ad1b7e4505f7c9dc32ad9550b62afc
2017-10-05 01:07:53 +00:00
nharold
cc51ef0a47 Merge "Cosmetic Cleanups for IpSecService" am: 5ade9a228d
am: 0bdb9a6e00

Change-Id: Iac3aa05b4de68b818fe840c2ade4aa600fe29622
2017-10-05 00:55:38 +00:00
rongliu
1e90fc38db Add a flag to virtual display to indicates that content on this
display need to be destroyed once the display is removed.
Then apply this flag to VR virtual display.

Change-Id: Icb5aa1280b6ebac5941afda1cc1b94b258ce44f4
Bug: 67420451
Test: Manually. "adb shell am stack list" does not show contents
from virtual display anymore after it's released.
2017-10-04 17:50:23 -07:00
nharold
0bdb9a6e00 Merge "Cosmetic Cleanups for IpSecService"
am: 5ade9a228d

Change-Id: If47968dbd55f8f38f9e8dda4d78a0e2e41827da8
2017-10-05 00:44:37 +00:00
Felipe Leme
63b45a87d5 Merge "Sets AutofillClient on attachBaseContext()" into oc-mr1-dev
am: 6d17d9d0cf

Change-Id: I4b1d2a4e308a91d15282ae99ee158b7004b91211
2017-10-04 22:25:18 +00:00
TreeHugger Robot
6d17d9d0cf Merge "Sets AutofillClient on attachBaseContext()" into oc-mr1-dev 2017-10-04 22:17:11 +00:00
nharold
b87c060ec7 Merge changes from topic "ipsec-svc-cleanup" am: 9778c7884f am: ae61e0c6e8
am: 4e793fd0b5

Change-Id: Ib7eae5c9e223493281524e862979e16d25984dde
2017-10-04 20:53:04 +00:00
nharold
4e793fd0b5 Merge changes from topic "ipsec-svc-cleanup" am: 9778c7884f
am: ae61e0c6e8

Change-Id: If8803e2fc98adb2f08a5bf2944fc60d0f0e71acd
2017-10-04 20:35:20 +00:00
Felipe Leme
d03db3c7f9 Merge "Improved javadocs for Autofill save workflow." into oc-mr1-dev
am: 94e07022c2

Change-Id: Iccafb0ef26a19788e6bd1d46fb856eb66d8e6087
2017-10-04 20:25:42 +00:00
nharold
ae61e0c6e8 Merge changes from topic "ipsec-svc-cleanup"
am: 9778c7884f

Change-Id: Ide81ae76bd05ba3a2cc7c06c072306d30a489057
2017-10-04 20:24:10 +00:00
Nathan Harold
d6f50b260d Cosmetic Cleanups for IpSecService
This is a follow-up CL to address comments
on aosp/466677
-Rename ManagedResourceArray.get()
-Comment cleanup

Bug: 38397094
Test: runtest frameworks-net
Change-Id: I6fbdd89c4a864fe1d8a19c68947f582d7b1f0f21
2017-10-04 13:04:55 -07:00
TreeHugger Robot
94e07022c2 Merge "Improved javadocs for Autofill save workflow." into oc-mr1-dev 2017-10-04 20:02:19 +00:00
nharold
9778c7884f Merge changes from topic "ipsec-svc-cleanup"
* changes:
  Split IpSecServiceTest to add IPv6 Tests
  Add equals() for IpSecAlgorithm and IpSecConfig
  Input Validation for IpSecService
2017-10-04 20:00:52 +00:00
Felipe Leme
bb567ae6c0 Sets AutofillClient on attachBaseContext()
When an activity overrides attachBaseContext(), the attached context must share
the same AutofillCient, otherwise it will break autofill in the activity.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.AttachedContextActivityTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Fixes: 67350639

Change-Id: I6b0c4c2fab5fa68eb6ee0714e107ca0816efb2cb
2017-10-04 12:23:23 -07:00
Jack He
1b41112e38 Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent" am: cfe51aabd2 am: 8057ba832e
am: 5dfce858ea

Change-Id: Ia3112971eb20c04325dd04bc76078195cec99a5f
2017-10-04 18:09:50 +00:00
Jack He
5dfce858ea Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent" am: cfe51aabd2
am: 8057ba832e

Change-Id: I946cce466bb5e048ad7b19cd97caa466dab27a52
2017-10-04 17:42:26 +00:00
Jack He
8057ba832e Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent"
am: cfe51aabd2

Change-Id: I6e2337a0b0f4722b82a91c53c340618b9277f3f6
2017-10-04 17:22:28 +00:00
Jack He
37ab815c96 PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent
* Use ACTION_CONNECTION_STATE_CHANGED to broadcast connection state
  change to comply with BluetoothProfile interface requirement
* Use BluetoothProfile.STATE_* variables to represent connection
  states for PBAP profile

Bug: 63873163
Test: Connect to car kits
Change-Id: I7dfcfc1b3a3e4868ea5e313f62ad5e504d58b9c2
2017-10-04 16:22:57 +00:00
Clara Bayarri
889c0c0f12 Merge "Fix NPE in ActivityThread" into oc-mr1-dev
am: 348b13f597

Change-Id: I4ac05199b93902bb19fd6eb42563e9c4fa00ed6c
2017-10-04 12:51:59 +00:00