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

280048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hall Liu
dbaca965bb Merge "Adds carrier config to determine if high definition audio is displayed" into nyc-mr2-dev 
am: e6d5a19e5f

Change-Id: Ifb5c7df88ad6191dfbfeda29b9b5fed97a32e530
 2016-12-15 23:07:04 +00:00
Wei Huang
0a26ddc7a3 Adds carrier config to determine if high definition audio is displayed 
am: f84a966106

Change-Id: I030077b8f9a8fa9f05d1a71f051cd19059c54bab
 2016-12-15 23:06:53 +00:00
Hall Liu
e6d5a19e5f Merge "Adds carrier config to determine if high definition audio is displayed" into nyc-mr2-dev 2016-12-15 22:41:38 +00:00
Adrian Roos
ef4812cdcf Merge "DirectReply: Show bouncer when occluded" into nyc-mr2-dev 
am: 23c46fb117

Change-Id: Idb6278c0b74c0308e77eab33c2c4cb503d93c123
 2016-12-15 22:37:11 +00:00
Adrian Roos
ad0ed5c63c DirectReply: Show bouncer when occluded 
am: f37fce5182

Change-Id: Ib3f82893fe744a3d382841e17e5a8e8dc1c3c19b
 2016-12-15 22:37:00 +00:00
Adrian Roos
23c46fb117 Merge "DirectReply: Show bouncer when occluded" into nyc-mr2-dev 2016-12-15 22:22:57 +00:00
Michael Kwan
763ab36642 Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev am: 738fb65657 
am: 106821edfe

Change-Id: I22a94a690862e5456d17e0e2ccd9f62ac9851240
 2016-12-15 21:31:48 +00:00
Michael Kwan
78f89e42e3 Fix swipe-to-dismiss to properly react to swipe gestures. am: 8a9b27773b 
am: 3707030cf5

Change-Id: Ia856a0b54eebc6821fff47cd90f05d73f49fdefd
 2016-12-15 21:30:42 +00:00
Michael Kwan
11655cd1f7 Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev am: 738fb65657 
am: a14aa31ef5

Change-Id: I4ae6d6728c607c985943bce7e4f241c006878f8b
 2016-12-15 21:24:55 +00:00
Michael Kwan
f6876c1169 Fix swipe-to-dismiss to properly react to swipe gestures. am: 8a9b27773b 
am: 4308eaa477

Change-Id: Id5fa0c8bd66ca7970c971884c1067aca4ac24124
 2016-12-15 21:23:44 +00:00
Michael Kwan
106821edfe Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev 
am: 738fb65657

Change-Id: Ica017f0a0490c522777f20e38b7db16872ccc615
 2016-12-15 21:16:19 +00:00
Michael Kwan
3707030cf5 Fix swipe-to-dismiss to properly react to swipe gestures. 
am: 8a9b27773b

Change-Id: If7040c0f1cc71edcc16021b4825fb5d1d6fbdecf
 2016-12-15 21:16:15 +00:00
Michael Kwan
a14aa31ef5 Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev 
am: 738fb65657

Change-Id: Ib2ab0dc43370d8387a56f2e3b3e3d50d44d7b772
 2016-12-15 21:16:08 +00:00
Michael Kwan
4308eaa477 Fix swipe-to-dismiss to properly react to swipe gestures. 
am: 8a9b27773b

Change-Id: I2b25052c22b5f50f95d0365eff4e3b2e27625b7f
 2016-12-15 21:16:05 +00:00
Michael Kwan
738fb65657 Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev 2016-12-15 21:09:57 +00:00
Martijn Coenen
432a964dde Merge "HwBinder: Remove use of IHw class." am: 11ec22ab2a am: df296fe1fa 
am: 370815ef62

Change-Id: I9a6b8dc6cf2e4c9d424c34513129d965155a0df7
 2016-12-15 20:55:49 +00:00
dcashman
f9acea3de2 Merge "Split mac_permissions.xml into plat and non-plat components." am: a1c9c860a9 am: 455202b9db 
am: 33d3d19235

Change-Id: I4c60853dc695943d1c9374ab5e1cc8af995de154
 2016-12-15 20:54:50 +00:00
dcashman
aa9ada00e6 Split mac_permissions.xml into plat and non-plat components. am: b1cc4f8ca4 am: 2a7ce100b7 
am: 46d6966f43

Change-Id: I99def3496b5319c2dd717b02fe28d9c691b47880
 2016-12-15 20:48:20 +00:00
Martijn Coenen
370815ef62 Merge "HwBinder: Remove use of IHw class." am: 11ec22ab2a 
am: df296fe1fa

Change-Id: I1c1069b5d2c1452f1cc9ee33725c3fa8f541966c
 2016-12-15 20:47:05 +00:00
dcashman
33d3d19235 Merge "Split mac_permissions.xml into plat and non-plat components." am: a1c9c860a9 
am: 455202b9db

Change-Id: I2a314f827db34cc92058729629d9000526b43027
 2016-12-15 20:45:55 +00:00
dcashman
46d6966f43 Split mac_permissions.xml into plat and non-plat components. am: b1cc4f8ca4 
am: 2a7ce100b7

Change-Id: I9d0e0f824fdc26c64d41f97b370f7483b63b97c5
 2016-12-15 20:41:14 +00:00
Martijn Coenen
df296fe1fa Merge "HwBinder: Remove use of IHw class." 
am: 11ec22ab2a

Change-Id: Icbeb3bb7548b00c5e28f689c761a4de425e1bd74
 2016-12-15 20:38:07 +00:00
dcashman
455202b9db Merge "Split mac_permissions.xml into plat and non-plat components." 
am: a1c9c860a9

Change-Id: I11397c898e5cf7b0dd4a300646b409d28eb00b59
 2016-12-15 20:32:54 +00:00
Martijn Coenen
11ec22ab2a Merge "HwBinder: Remove use of IHw class." 2016-12-15 20:28:49 +00:00
dcashman
2a7ce100b7 Split mac_permissions.xml into plat and non-plat components. 
am: b1cc4f8ca4

Change-Id: I4c3d3a9c088c4cfc75f5503966390030e1375305
 2016-12-15 20:27:27 +00:00
Treehugger Robot
a1c9c860a9 Merge "Split mac_permissions.xml into plat and non-plat components." 2016-12-15 20:13:28 +00:00
Android Build Merger (Role)
87d9244976 Merge "Add null check to a11y interrupt. am: 74f9e1b867 am: 278782f275" into nyc-mr2-dev-plus-aosp 2016-12-15 19:12:53 +00:00
Phil Weaver
037692d5ab Add null check to a11y interrupt. am: 74f9e1b867 
am: 718f403b50

Change-Id: I9d70640813bd91e035f9614f0403e18b7706e53f
 2016-12-15 19:12:02 +00:00
Phil Weaver
a1e8241740 Add null check to a11y interrupt. am: 74f9e1b867 
am: 278782f275

Change-Id: I92d0cce490535b667a10de46fe0e24fad6305c13
 2016-12-15 19:11:56 +00:00
Phil Weaver
278782f275 Add null check to a11y interrupt. 
am: 74f9e1b867

Change-Id: I51bcf42327f30a0c6b1dc7666a5c057d44eec98c
 2016-12-15 19:05:00 +00:00
Phil Weaver
718f403b50 Add null check to a11y interrupt. 
am: 74f9e1b867

Change-Id: I8bb63b88a12ab6f8dfae42918ab9fdf4b1a457b5
 2016-12-15 19:04:59 +00:00
dcashman
b1cc4f8ca4 Split mac_permissions.xml into plat and non-plat components. 
Bug: 31363362
Test: Bullhead and Sailfish both build and boot without new denials.
Change-Id: Ic9523ce4b0755d6c585548f4f2b1f00e7000195b
 2016-12-15 10:04:38 -08:00
Michal Karpinski
abad2df4c2 DO NOT MERGE Make NetworkLogger.mIsLoggingEnabled an AtomicBoolean 
am: 92cd0ce92d

Change-Id: I598cd5962f9e38750d528f480b7a99e3357fc437
 2016-12-15 14:31:47 +00:00
Michal Karpinski
92cd0ce92d DO NOT MERGE Make NetworkLogger.mIsLoggingEnabled an AtomicBoolean 
Fixes a potential race condition - when enabling/disabling the logging
some events might have been lost.

Bug: 29748723
Change-Id: I8a436d525393b2314805e287eddcea26d4ec073b
 2016-12-15 12:54:36 +00:00
Erik Kline
7fed2942ea Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." am: 80ff5ecd4a am: cdcc931d93 
am: 62c1d307e3

Change-Id: I05da79d601d412270a71026bbbad3c516a785422
 2016-12-15 12:35:13 +00:00
Erik Kline
62c1d307e3 Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." am: 80ff5ecd4a 
am: cdcc931d93

Change-Id: Ib46bdab897cef221f4c22326e562130822d42298
 2016-12-15 12:28:41 +00:00
Erik Kline
cdcc931d93 Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." 
am: 80ff5ecd4a

Change-Id: If85702e1cc44967841ab91d723aa627862bcda21
 2016-12-15 12:22:06 +00:00
Erik Kline
80ff5ecd4a Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." 2016-12-15 12:10:17 +00:00
Joachim Sauer
be12d9bfd3 Merge "API updated for ICU4J 58.1" am: 9e3b160fc3 am: d20aebb443 
am: c066d73c32

Change-Id: Ie3f10df12dd96d9e002bdef017759c394aa3e780
 2016-12-15 11:54:42 +00:00
Joachim Sauer
c066d73c32 Merge "API updated for ICU4J 58.1" am: 9e3b160fc3 
am: d20aebb443

Change-Id: Ib3ddf7441306adca048e2ef5c6cda31bb2543df6
 2016-12-15 11:39:37 +00:00
Joachim Sauer
d20aebb443 Merge "API updated for ICU4J 58.1" 
am: 9e3b160fc3

Change-Id: If8d8b9708217442bf23f092ef2e1bfd235926aff
 2016-12-15 11:24:52 +00:00
Joachim Sauer
9e3b160fc3 Merge "API updated for ICU4J 58.1" 2016-12-15 11:16:41 +00:00
Erik Kline
e1389b7084 Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." into nyc-mr2-dev 
am: c75ab85cd2

Change-Id: Ie343e7b86b970f2d934b964eebe924f74b0138d2
 2016-12-15 10:13:48 +00:00
Erik Kline
eff558cd30 Have IpManager track L2-L4 signaling traffic required for IP connectivity. 
am: 473355f96b

Change-Id: Ie95309464d8f368f5040c74b59daba9700191e86
 2016-12-15 10:13:36 +00:00
Erik Kline
ade3a8ccb0 Have IpManager track L2-L4 signaling traffic required for IP connectivity. 
Test: as follows
    - built and flashed
    - observed logcat
    - observed "dumpsys wifi ipmanager"
    - runtest BlockingSocketReaderTest passes
    - runtest ConnectivityPacketSummaryTest passes
Bug: 21859053
Bug: 26101306
Bug: 31742572
Bug: 31707128
Bug: 33531488

Change-Id: Ibecaf809dcc1813924b25749e8ba8eb2d4bdf114
 2016-12-15 19:09:49 +09:00
TreeHugger Robot
c75ab85cd2 Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." into nyc-mr2-dev 2016-12-15 10:03:46 +00:00
Erik Kline
473355f96b Have IpManager track L2-L4 signaling traffic required for IP connectivity. 
Test: as follows
    - built and flashed
    - observed logcat
    - observed "dumpsys wifi ipmanager"
    - runtest BlockingSocketReaderTest passes
    - runtest ConnectivityPacketSummaryTest passes
Bug: 21859053
Bug: 26101306
Bug: 31742572
Bug: 31707128
Bug: 33531488

Change-Id: Ibecaf809dcc1813924b25749e8ba8eb2d4bdf114
 2016-12-15 17:16:48 +09:00
Phil Weaver
74f9e1b867 Add null check to a11y interrupt. 
Also adding same robustness to interrupt that we have for
sending a11y events.

Bug: 32507871

Test: Ran a11y CTS. Verified manually with sample app
that sends interrupt and accessibility service that
crashes when started. That case used to crash the
app, and doesn't anymore.
Change-Id: I5cf05dcbb54ea23ae876cb3258dd206c55dce775
(cherry picked from commit 867ad35d9c676b5ba2047b0fc9a4006737e5c4aa)
 2016-12-15 08:06:15 +00:00
Bill Yi
ea79b5e4b9 Import translations. DO NOT MERGE 
am: 1e0cc808ab  -s ours

Change-Id: I1d7db8246f0864af9e03f6dee3cf6206763b3301
 2016-12-15 08:03:52 +00:00
Colin Cross
92a868ed53 Merge changes I4968d5aa,Ieb34d79a,Idc073536 am: c2f9ae35e6 am: 4379639606 
am: b9743aa650

Change-Id: Ib90a26ffe1b9af8cf83c8b1c1342aaa9f5e06752
 2016-12-15 07:31:25 +00:00