Commit Graph

277484 Commits

Author SHA1 Message Date
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
Robert Sesek
f80fab010a Merge "Create the WebViewZygote and implement WebViewZygoteInit."
am: 8be2850546

Change-Id: I608ea53be52cb91f0e8cf73998de4578b39e099a
2016-10-22 03:12:18 +00:00
Treehugger Robot
8be2850546 Merge "Create the WebViewZygote and implement WebViewZygoteInit." 2016-10-22 03:03:10 +00:00
Yin-Chia Yeh
50f9b6e71f Merge "Camera2 Legacy: catch more surface abandoned error"
am: 03f14bef41

Change-Id: If2e05eeb8c7fe24f97fc0c5e20bfe03a6c8c9e23
2016-10-21 21:07:44 +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
bb08c03048 Merge "Fix accounting for .vdex in dumpsys meminfo"
am: 4a5789b9b1

Change-Id: I3e50c0e6a80bc221228dd8293ec8209ecf323123
2016-10-21 17:20:27 +00:00
Mathieu Chartier
4a5789b9b1 Merge "Fix accounting for .vdex in dumpsys meminfo" 2016-10-21 17:07:37 +00:00
liulvping
0046acc2db Merge "fix mistaken check of mScreenBrightnessDarkConfig"
am: e6fe836938

Change-Id: I4eda1d6aed52fa4d8cbcd1ade29e96f14e58bab7
2016-10-21 04:38:38 +00:00
Brad Ebinger
ce21e3ffa8 Merge "Switch on android.telecom.Log in Telecom"
am: 37521b9ba5  -s ours

Change-Id: I1a624721f577be6b1cf684208cdeb4e0471e51f2
2016-10-21 04:37:28 +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
ce97bfbdb2 Switch on android.telecom.Log in Telecom
Move over the Runnable Class into android.telecom and turn on the
framework's usage in Telecom.
CP from: https://android-review.googlesource.com/#/c/287291/

Test: All Telecom unit tests pass. Manual Log testing has also been
confirmed to be working as it did before.
Bug: 26571395
Change-Id: If7e2036c746c5a953f3a77e2d625a423ce5bf8f3
(cherry picked from commit 9fbbd4052d)
2016-10-20 23:18:26 +00:00
Jacky Cheung
046a5c3a00 Merge "Gradually increase the level of authentication on failed GATT operations."
am: 6071abdb92

Change-Id: If06babf4a23879acdfc358838cdc094d753c362b
2016-10-20 23:03:57 +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
b4ef12bba7 Merge "Adds registerSessionListener API to Log"
am: e3daed81eb

Change-Id: Ia42cba6a735170ce1aea653bd42b6f1182853819
2016-10-20 22:09:30 +00: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
George Burgess IV
ea4423b181 Merge "Fix a static-analyzer warning."
am: 63b4f6f5db

Change-Id: I85fd6d25733d59da76eb0bab381fdbd3b5a0430d
2016-10-20 19:19:15 +00: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
abfd527d09 Merge "HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on"
am: 2202b164d8

Change-Id: I43bec2c6d3e6e4201f7a50981f428ef00f384684
2016-10-19 19:39:03 +00:00
Christopher Wiley
c6e72b30c7 Merge "Use this.isUp() inside InterfaceConfiguration"
am: 239df3cc5a

Change-Id: Id6f064d7a74e41d757de2499653671fc830d217b
2016-10-19 19:31:57 +00: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
fb56958223 Merge "Hide QS customizer correctly"
am: 03e4eb32fe

Change-Id: I8c1998de76beee26b703781a6f883e9efd24bde3
2016-10-19 15:15:43 +00:00
Jason Monk
03e4eb32fe Merge "Hide QS customizer correctly" 2016-10-19 15:05:41 +00:00
Yong Shi
70ed1127fd Two digit call support for Claro
Following numbers should be dialed normally for Claro Honduras
and Claro GT:
  *1 - Customer service
  *5 - Balance request
  *9 - Balance payment
  (Claro Honduras does not use *9)

Bug: 32269900
Change-Id: I147788d93336b29ce007087e53e4def0bd4104f4
2016-10-19 22:07:25 +09:00
Brad Ebinger
cedb97bfb6 Merge "Add support for new SessionManager and EventManager tests"
am: 42598f4a96

Change-Id: I9c629074ca39dfb06bd6b16217ba5e59a9e0a004
2016-10-18 21:30:57 +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
Gopal Krishna Shukla
008a08dcee Schedule agentDisconnected() in handler thread
BackupManager.agentDisconnected() need not acquire
ActivityManagerService lock. Post this in handler thread.
This will avoid a potential deadlock between
ActivityManagerService lock and BackupManagerService lock.

Test: Build successful

Change-Id: Iabea1159d3e2bd8980c8a0d068fb5d0583c08535
2016-10-18 15:32:32 +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
George Burgess IV
1db1a86bba Merge "Fix static analyzer warnings."
am: ff5c3ad08b

Change-Id: I655fd765cfeae407c070261cfe07ce8b739b06fa
2016-10-18 01:43:24 +00:00
Treehugger Robot
ff5c3ad08b Merge "Fix static analyzer warnings." 2016-10-18 01:30:55 +00:00
Sanket Agarwal
086be31642 Merge "Remove APIs that are not directly usable."
am: 9cff57312d

Change-Id: I1234db97ed82017ed3bca02e10818a53fdc33d3d
2016-10-17 21:28:05 +00:00
Mark Salyzyn
6a8f0d70b0 Merge "missing includes"
am: 78929f3ee0

Change-Id: I3e7a25ded484d516fab453abe434c2e53cf0f27e
2016-10-17 21:25:59 +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
Yoshinori Hirano
9531933797 Merge "Avoid automatically mirroring Drawable of CustomTile"
am: 9a904d68c7

Change-Id: I337620f4a2514a00a6b49275cadde6087e11dddf
2016-10-17 17:00:44 +00:00
Treehugger Robot
9a904d68c7 Merge "Avoid automatically mirroring Drawable of CustomTile" 2016-10-17 16:42:18 +00:00
Christopher Wiley
281d7490bf Merge "Add InterfaceConfiguration.isUp()"
am: c7ea99a63c

Change-Id: Id0bc63c82f8ffd6ad411769ab012efd8bbdfa3ce
2016-10-17 16:41:52 +00:00
Treehugger Robot
c7ea99a63c Merge "Add InterfaceConfiguration.isUp()" 2016-10-17 16:30:44 +00:00