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

293937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Ebinger
c166c7d0f4 Merge "Adds registerSessionListener API to Log" am: e3daed81eb am: b4ef12bba7 
am: 4f28458250

Change-Id: Ic6118d1bc07fc7adeb9914d30c2107e604d669ef
 2016-10-20 22:23:31 +00: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
c0ea07cb5d Merge "Add custom scrollbars to the default device theme" into cw-f-dev am: faf09eaa40 
am: 4768313c02

Change-Id: I3e37fab0d61244db77404f12f1da5e127f1ab0a0
 2016-10-20 22:05:28 +00:00
sergeyv
5fd2a1cb27 Pass Bitmap instead of SkBitmap in drawNinePatch & drawBitmapMesh 
Test: refactoring cl.
bug:32216791

Change-Id: I5adcd59daf752d36012456b0a9960c59d07e2e3d
 2016-10-20 15:04:28 -07:00
Aga Madurska
134d7df25d Add custom scrollbars to the default device theme am: 78a340f2b6 
am: 9f47d20e57

Change-Id: Ia7531c574806cd241040bd9fdacae94c0c5d5b3b
 2016-10-20 22:04:28 +00:00
Matthew Fritze
65d574ad54 Merge "Default for sending package name to support should be false" into nyc-mr1-dev am: 71ae440ac2 am: 46af871c00 
am: 30678ec096

Change-Id: Ia02f949534ba1b194665e26a18eab79f7589eeba
 2016-10-20 22:02:49 +00:00
Matthew Fritze
02d67b6bf1 Default for sending package name to support should be false am: b68a83a8eb am: 4d9085f1d2 
am: 6adcb1b33a

Change-Id: I79355e651feb9492a8bd21b1ed865e9d725df14d
 2016-10-20 22:01:51 +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
Selim Gurun
6359e320aa Merge "Update the documentation for onCreateInputConnection" 2016-10-20 21:47:40 +00:00
Adam Lesinski
6a396c1abb AAPT2: Error on uncompiled XML or PNG files in link phase 
Incorrectly passing text XML and unprocessed PNG files to
the AAPT2 link phase should raise an error.

Test: manual incorrect invocation of aapt2
Change-Id: Iab47f99bc378b5d1c4f4d87098f08243b9a4dc6a
 2016-10-20 14:40:49 -07:00
Jacky Cheung
a502540d1e Merge "Gradually increase the level of authentication on failed GATT operations." into cw-f-dev am: 8167362bab 
am: 132263d8f9

Change-Id: Id48f048974d99570cb4d7df73c3cc2f110530f10
 2016-10-20 21:40:20 +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
Jacky Cheung
d3641398b2 Gradually increase the level of authentication on failed GATT operations. am: 84c6d339ee -s ours 
am: aeda8be7b2

Change-Id: Ifa2468c91a9d54f18be8cf51c91240ab1bf6ac5f
 2016-10-20 21:39:13 +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
Shuzhen Wang
461f767606 Merge "Camera2: Add onCaptureQueueEmpty callback" 2016-10-20 21:36:16 +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
Jason Monk
3b75827cbf Merge "Add nav gesture plugin interface" 2016-10-20 21:16:20 +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
sergeyv
fc9999505a Pass Bitmap instead of SkBitmap for bitmap rect operation 
Test: refactoring cl.
bug:32216791

Change-Id: I66d19194c57b3aa2c400aa87acffc774a533776a
 2016-10-20 14:04:35 -07: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
Selim Gurun
c92080bd78 Update the documentation for onCreateInputConnection 
Update the documentation to clarify that WebView calls methods of the
InputConnection on a separate thread than the UI thread. This is,
in some sense, similar to shouldInterceptRequest. The methods
that override InputConnection methods should be careful about thread
restrictions and concurrency when calling other methods or accessing
shared members.

Test: Document update. Verified manually.
Change-Id: Ida76cd5dcc683092c05947c3044d848d0a249547
 2016-10-20 13:48:08 -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
0b27727926 Add option to skip and avoid captive portals. am: 4bc78eba6f 
am: 4a048f9964

Change-Id: I530ccb95aa97100b27d71186173645031082acc1
 2016-10-20 20:26:52 +00:00
Brad Ebinger
e61d1a83d4 Merge changes from topics 'logging_analytics_hooks', 'logging_switch' 
* changes:
  Adds registerSessionListener API to Log
  Switch on android.telecom.Log in Telecom
 2016-10-20 20:24:58 +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
Android Build Merger (Role)
d8c7400994 Merge "Merge "Fix a static-analyzer warning." am: 63b4f6f5db am: ea4423b181 am: 281e9f30c0" 2016-10-20 19:36:27 +00:00
Sergei Vasilinetc
4d2a1dc01f Merge "Pass Bitmap instead of SkBitmap in canvas.drawBitmap(Bitmap, float,float,Paint) Test: refactoring cl. bug:32216791" 2016-10-20 19:35:59 +00:00
George Burgess IV
092db3c88a Merge "Fix a static-analyzer warning." am: 63b4f6f5db am: ea4423b181 
am: 281e9f30c0

Change-Id: If34a4265ceb5bc6f4bf31c35e82270f90e970457
 2016-10-20 19:35:45 +00:00
Sergei Vasilinetc
638afc8b0f Merge "Rename hwui/PixelRef to hwui/Bitmap Test: refactoring cl. bug:32216791" 2016-10-20 19:35:31 +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
TreeHugger Robot
3e934442fa Merge "Import translations. DO NOT MERGE" 2016-10-20 19:05:54 +00:00
Joe Onorato
f0c719821d am instrument gets protobuf 
Refactor the am instrument command and add a version that
outputs protobuf in addition to the old one that prints
loosely formatted text.

Change-Id: I34079d8af2b7b6c6c59837d54719806109ba286c
Test: bit tool
 2016-10-20 11:57:57 -07:00
Joe Onorato
3a5eb29720 Fix bad type codes in streaming proto compiler 
Change-Id: I4623f0a726107ec1321cadcaaf83b23353d0728e
Test: make StreamingProtoTest
 2016-10-20 11:57:22 -07:00
TreeHugger Robot
5cbc47ffd7 Merge "Removed WindowState.getWindowList()" 2016-10-20 18:52:03 +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
TreeHugger Robot
011cef54ee Merge "Re-order draw methods to make update-api happy" 2016-10-20 18:49:03 +00:00
Jason Monk
67e6c80405 Add nav gesture plugin interface 
Test: Manual
Change-Id: Ieb61a98cb1921358d41728bdbc7fb0c9c8fa46c1
 2016-10-20 14:26:23 -04: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
Sudheer Shanka
c2c956b3c4 Merge "Move ApplicationThread to aidl." 2016-10-20 17:55:06 +00:00
Keun-young Park
6716e32fea Merge "add default overlay for END_CALL_BEHAVIOR" 2016-10-20 17:24:15 +00:00