drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
276,841 Commits 1 Branch 0 Tags
Commit Graph

276841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brad Ebinger
7ed42a72c0 Switch on android.telecom.Log in Telecom 
am: ce97bfbdb2

Change-Id: Ic7827f1627eca43937609e21d15186f483381182
 2016-10-21 04:37:22 +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
Michael Kwan
9c86e68bfa Fix improperly laid out alert dialog title to match UX specs. 
Test: visual inspect using ApiDemos

Bug: 32315229
Change-Id: I486edc94c077af49e1235519e158e55833796231
 2016-10-20 18:39:31 -07: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 9fbbd4052dee1dfa74b87502cec91cc51170d69d)
 2016-10-20 23:18:26 +00:00
Jacky Cheung
bd12e5c9db Merge "Gradually increase the level of authentication on failed GATT operations." am: 6071abdb92 
am: 046a5c3a00

Change-Id: I749b2e4d4a13f099cfdc164f7fec8556d09f8433
 2016-10-20 23:11:51 +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
4f28458250 Merge "Adds registerSessionListener API to Log" am: e3daed81eb 
am: b4ef12bba7

Change-Id: I255d21923f45efcfc9d75057d42992dc58088e73
 2016-10-20 22:15:57 +00:00
Brad Ebinger
b4ef12bba7 Merge "Adds registerSessionListener API to Log" 
am: e3daed81eb

Change-Id: Ia42cba6a735170ce1aea653bd42b6f1182853819
 2016-10-20 22:09:30 +00:00
Agnieszka Madurska
4768313c02 Merge "Add custom scrollbars to the default device theme" into cw-f-dev 
am: faf09eaa40

Change-Id: Iaf21cc52a4c678be6bb31cfdeb64d79b8b8b32f5
 2016-10-20 21:54:18 +00:00
Aga Madurska
9f47d20e57 Add custom scrollbars to the default device theme 
am: 78a340f2b6

Change-Id: I67f5e74259b5fa16bd647e7b7796d34a798ee175
 2016-10-20 21:54:11 +00:00
Brad Ebinger
e3daed81eb Merge "Adds registerSessionListener API to Log" 2016-10-20 21:51:53 +00:00
Agnieszka Madurska
faf09eaa40 Merge "Add custom scrollbars to the default device theme" into cw-f-dev 2016-10-20 21:39:51 +00:00
Matthew Fritze
30678ec096 Merge "Default for sending package name to support should be false" into nyc-mr1-dev am: 71ae440ac2 
am: 46af871c00

Change-Id: I92aa1053b8fefc36c617b3ad69af0af039fc6493
 2016-10-20 21:36:26 +00:00
Matthew Fritze
6adcb1b33a Default for sending package name to support should be false am: b68a83a8eb 
am: 4d9085f1d2

Change-Id: I10fb181b9aebc66bbbcaa646618f26ca84dfe552
 2016-10-20 21:35:14 +00:00
Jacky Cheung
132263d8f9 Merge "Gradually increase the level of authentication on failed GATT operations." into cw-f-dev 
am: 8167362bab

Change-Id: I437b4df98f960426836536e96cdc33458162f649
 2016-10-20 21:29:45 +00:00
Jacky Cheung
aeda8be7b2 Gradually increase the level of authentication on failed GATT operations. 
am: 84c6d339ee  -s ours

Change-Id: Icf50ddb340569c398d2820989083668a2c35c7f4
 2016-10-20 21:29:32 +00:00
Matthew Fritze
46af871c00 Merge "Default for sending package name to support should be false" into nyc-mr1-dev 
am: 71ae440ac2

Change-Id: Idc18efe910dda8339e5fa7030e61b6172092f64a
 2016-10-20 21:16:24 +00:00
Matthew Fritze
4d9085f1d2 Default for sending package name to support should be false 
am: b68a83a8eb

Change-Id: Ic30a1508a9f7a8b1592778fc7eaa44692e99e579
 2016-10-20 21:16:20 +00:00
Matthew Fritze
71ae440ac2 Merge "Default for sending package name to support should be false" into nyc-mr1-dev 2016-10-20 21:05:09 +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
Jacky Cheung
8167362bab Merge "Gradually increase the level of authentication on failed GATT operations." into cw-f-dev 2016-10-20 20:42:09 +00:00
Calvin On
4a048f9964 Add option to skip and avoid captive portals. 
am: 4bc78eba6f

Change-Id: Id38d5c03d06822f9b20abd65db9dd04c90110b63
 2016-10-20 20:18:10 +00:00
George Burgess IV
281e9f30c0 Merge "Fix a static-analyzer warning." am: 63b4f6f5db 
am: ea4423b181

Change-Id: I47de526a03bed05c4f69a89ec3ed2403a7e3b536
 2016-10-20 19:26:59 +00: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
Calvin On
4bc78eba6f Add option to skip and avoid captive portals. 
Test: ConnectivityServiceTest updated with test cases.
Test: Manually tested against att-wifi in B42.
Bug: 30222699
Change-Id: Ibe63942da04748ab0406e24e0f44be31d47710a0
(cherry picked from commit be96da11ccb5dd500f920c3ba90d350857293b3d)
 2016-10-20 18:50:46 +00:00
Matthew Fritze
b68a83a8eb Default for sending package name to support should be false 
Change-Id: I2cc90cac2c2c72f9febb015487f8854ebf006aac
Fixes: 32303343
Test: manual
 2016-10-20 11:24:54 -07:00
Jacky Cheung
84c6d339ee 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.

Change-Id: I68335cf7451aeaf49c227d604f69cb329d117d08
 2016-10-20 18:17:12 +00:00
Bill Yi
b56b616c1a Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 3623134476 -s ours 
am: f9ca194dbe  -s ours

Change-Id: I40b3ca138f9514314b94a4748ebbbbc74bf848e5
 2016-10-20 16:11:52 +00:00
Bill Yi
d4c3c7dda2 Import translations. DO NOT MERGE am: 66dc59064a -s ours 
am: 8236940965  -s ours

Change-Id: I7eca255c8bbd3a70e2b18f75080e33c9be9ac061
 2016-10-20 16:11:03 +00:00
Bill Yi
cbe06ade4a Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f7a7712d50 -s ours 
am: 4df6ac860e  -s ours

Change-Id: I8d43798266a46cfe198314e80af52042fe4c1ade
 2016-10-20 16:10:05 +00:00
Bill Yi
e92a8e80c8 Import translations. DO NOT MERGE am: 5ad7d6e328 -s ours 
am: a3e34d4384  -s ours

Change-Id: I4b6b7b363fc8e7a5fb4610bd650928acdfda5763
 2016-10-20 16:09:13 +00:00
Bill Yi
d2a5fd0fee Import translations. DO NOT MERGE am: 7f5b5eee99 -s ours 
am: 3aa778d239  -s ours

Change-Id: Idaf4afb7a5b9d94bdc46ac765781ffa23f79e337
 2016-10-20 16:05:27 +00:00
Bill Yi
f9ca194dbe Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 3623134476  -s ours

Change-Id: Ia0155fdcebd8c81c24dd68ea345ad4fb40a110d3
 2016-10-20 16:03:58 +00:00
Bill Yi
8236940965 Import translations. DO NOT MERGE 
am: 66dc59064a  -s ours

Change-Id: Ic64d34c0cc499094b3e43789ed9f28f45801b8cd
 2016-10-20 16:03:56 +00:00
Bill Yi
94944621b3 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 0f62ca3a57  -s ours

Change-Id: Ic7f85082337cee707f4166508ae49986471a925f
 2016-10-20 16:03:54 +00:00
Bill Yi
8eb2c31c42 Import translations. DO NOT MERGE 
am: 59d5ed7768  -s ours

Change-Id: I12da8ae4edd14a2a4efd554c6f8d5f91bb180945
 2016-10-20 16:03:49 +00:00
Bill Yi
4df6ac860e Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: f7a7712d50  -s ours

Change-Id: I2c73b3824bd0fdcb3628e71c641b811202d26d2a
 2016-10-20 16:02:34 +00:00
Bill Yi
a3e34d4384 Import translations. DO NOT MERGE 
am: 5ad7d6e328  -s ours

Change-Id: I6b1a80f5cbc2282afe50101e2a6fdc3b7c17db52
 2016-10-20 16:02:32 +00:00
Bill Yi
3e8d6d5dd6 Import translations. DO NOT MERGE 
am: 0de1d97546  -s ours

Change-Id: I8867998a7d4908592ab6001d65af6ed3a9169297
 2016-10-20 16:02:31 +00:00
Bill Yi
3aa778d239 Import translations. DO NOT MERGE 
am: 7f5b5eee99  -s ours

Change-Id: I550b053800133c76cc6abf3daeefd2790ffe2363
 2016-10-20 15:56:51 +00:00
TreeHugger Robot
0f62ca3a57 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-10-20 15:54:28 +00:00
TreeHugger Robot
3623134476 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-20 15:53:29 +00:00
TreeHugger Robot
f7a7712d50 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-20 15:52:53 +00:00
Bill Yi
7f5b5eee99 Import translations. DO NOT MERGE 
Change-Id: I6fffe370549a3c2904043151dee4bc06f6799f81
Auto-generated-cl: translation import
 2016-10-20 07:17:55 -07:00