Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
252,839 Commits 3 Branches 0 Tags
052dce27c9bd59e8ee1cbf1b2bccb36167d04a9e
Commit Graph

252839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
4e0916b416 Refactor NetworkNotificationManager. am: 0b59906768 
am: a6dcb89e6d

Change-Id: I635e0dfca74a1dc3e0291c42aeed7c3a6a978dbd
 2016-08-23 15:48:48 +00:00
Lorenzo Colitti
28707247f4 Move notification code out of ConnectivityService. am: f3ae2eeae4 
am: 622b5fbbf5

Change-Id: Iecbc0416842fa8d8ed4efb2ca666793240f7a2cc
 2016-08-23 15:47:38 +00:00
Bill Yi
3f8d11d863 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 4e3fe5c7d8  -s ours

Change-Id: I5d962b9e1e82a57ab43f32f6303242fe8a887125
 2016-08-23 15:47:35 +00:00
Bill Yi
581dd8cfdd Import translations. DO NOT MERGE 
am: f2e311f117  -s ours

Change-Id: I08109e0d9358d5d60d9c4d7608f683da010313a0
 2016-08-23 15:47:33 +00:00
Daichi Hirono
94d659ea6a Merge "Set Root.FLAG_LOCAL_ONLY for MTP roots." into nyc-mr1-dev 
am: 5e252cecd1

Change-Id: Ic6ff84db074e5fa9770833cff4fcfa720f78cf6f
 2016-08-23 15:47:30 +00:00
Daichi Hirono
d590e3354d Set Root.FLAG_LOCAL_ONLY for MTP roots. 
am: b7573e93cd

Change-Id: I80771a8ab9bffac23a63087ae615ece83cc42d18
 2016-08-23 15:47:27 +00:00
Scott Main
f8a0cb2964 Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev 
am: 77917a835f

Change-Id: Ibc54a5b58aad47a49bf5cb5a69ae3ddf461ccd15
 2016-08-23 15:47:18 +00:00
smain@google.com
349edcf169 add workaround for annotations dependency conflict with espresso 
am: eee3518d11

Change-Id: I05f1b9063433e060427f627c46aab64972fe45cf
 2016-08-23 15:47:15 +00:00
Ta-wei Yen
9a107a2df0 Add carrier regex config values for VisualVoicemailSmsFilter 
Verizon requires all SMS that starts with "//VZWVVM" to be treated
as a VVM SMS.

EXTRA_VOICEMAIL_SMS_MESSAGE_BODY is also added to VociemailContract
to send the message body of a SMS that matches the carrier regex but
is not parsable.

Bug: 30954955
Change-Id: Ib5449164a5290b132648cc28b1e1d3d9ddd5fea0
(cherry picked from commit ad31603b80)
 2016-08-23 15:42:31 +00:00
Scott Main
77917a835f Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev 2016-08-23 15:42:03 +00:00
Yang Ni
606dcbd897 Updated user document for Single-Source RenderScript am: c069ed7f8c am: 044cd35a46 
am: 92b787bbf7

Change-Id: Ieb9f754c0bc43813439551d743dc055472f2da20
 2016-08-23 15:37:30 +00:00
Todd Kennedy
875a96f5ac Merge "No need to check package name" into nyc-mr1-dev 
am: 40db730b7f

Change-Id: Ie9c2477585243f80392194d8d9b41ad693d6aab3
 2016-08-23 15:37:28 +00:00
Todd Kennedy
b9de7e33a3 No need to check package name 
am: afb5269ad6

Change-Id: Ic3f3eebbb40ef5ae55e0c62003550473d23a3eb2
 2016-08-23 15:37:26 +00:00
Fyodor Kupolov
a6742e1c7a Merge "Added getDataPreloadsMediaDirectory" into nyc-dr1-dev am: 0a376f5619 
am: 6af20d1c4e

Change-Id: Ibf6cfbc395224845f8132e8d3c614ab0302a920e
 2016-08-23 15:37:05 +00:00
Fyodor Kupolov
ca1a630ccf Added getDataPreloadsMediaDirectory am: 19551a8d8d 
am: c98c7e9da1

Change-Id: Ibde055a6d442b74e17bc07991e8ea6bd2497fe6b
 2016-08-23 15:36:19 +00:00
Jorim Jaggi
6afa73312c Merge changes from topic 'am-c5d69672042b41758555eb3db8f077fe' into nyc-mr1-dev 
am: f6f4f1ac61

Change-Id: Id3d8f253b1db24c1bb383bda9e005fcb8c59ad2f
 2016-08-23 15:35:15 +00:00
Jorim Jaggi
5a08c35738 Merge "Change retail mode wallpaper (1/2)" into nyc-dr1-dev am: c7136b3b3c 
am: 9b2c0bf87e

Change-Id: I3631edf2a9f0e76b9670ba6bbfc1905c1503ff7c
 2016-08-23 15:35:03 +00:00
Jorim Jaggi
3d19454ec9 Change retail mode wallpaper (1/2) am: 6c902d0453 
am: 9d0879c6ac

Change-Id: I639e21420319261126227da7296e876a07976dc1
 2016-08-23 15:34:06 +00:00
Adam Powell
2c9cfdf968 Merge "Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev am: 081e393103" into nyc-mr1-dev 
am: b352d0a45a

Change-Id: Ied7ef0ddeb4bbc5c80f5ccce5aa817b0a9244655
 2016-08-23 15:33:59 +00:00
Adam Powell
abcc76610f Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev am: 081e393103 
am: 1b192da3fe

Change-Id: If8df0bd5aec1d32da478d7c12ee7c16d6bf388a7
 2016-08-23 15:33:57 +00:00
Adam Powell
79cb1d7a49 Merge "Only dispatch window visibility aggregation for targetSdk >= N am: 64e1ba4398" into nyc-mr1-dev 
am: 998ff1c7be

Change-Id: I73b8052c7f2340c53ba1055bff6533cb19671018
 2016-08-23 15:33:51 +00:00
Adam Powell
ca3a267478 Only dispatch window visibility aggregation for targetSdk >= N am: 64e1ba4398 
am: 02abbe8d4c

Change-Id: I66f8610e52f2aaf06b02fa8d369692fc2f89ee17
 2016-08-23 15:33:49 +00:00
Dirk Dougherty
67442d4c7a Merge "Doc change: intl page updates for final n release. am: e816f1f542 am: 79d9e9df2e" into nyc-mr1-dev 
am: f14ba4c10f

Change-Id: Ie7c4ee20cfc16a135bb5a2116442215bb2afd74b
 2016-08-23 15:25:23 +00:00
Dirk Dougherty
4639359ddc Doc change: intl page updates for final n release. am: e816f1f542 am: 79d9e9df2e 
am: 4a273d8bb9

Change-Id: Iefccf2db7748d32325e8f3657f53a9aabb3d83c2
 2016-08-23 15:25:21 +00:00
Chris Tate
9927f7f08b Merge "Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev am: 56ce19099d" into nyc-mr1-dev 
am: 2733c16556

Change-Id: I44879ede18607dfa21984f3d059cfdd80193b246
 2016-08-23 15:25:15 +00:00
Chris Tate
f4b8d26f9d Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev am: 56ce19099d 
am: ad3f9a03ea

Change-Id: I329ca50f9bc4049be3da5f936ab432f47f33a9ba
 2016-08-23 15:25:13 +00:00
Christopher Tate
c899f55156 Merge "Fix wallpaper backup eligibility test am: f7d1b5de6e" into nyc-mr1-dev 
am: e022290806

Change-Id: Ib016b9731e1efa1980112ed2d38e8553ff0973d0
 2016-08-23 15:25:08 +00:00
Christopher Tate
6939bf0b05 Fix wallpaper backup eligibility test am: f7d1b5de6e 
am: 100b610066

Change-Id: I243b821aa35b75ad69ed9ddcf45ef6a4342e4605
 2016-08-23 15:25:06 +00:00
Adam Seaton
9058e1ac19 Merge "Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads." into nyc-dr1-dev am: 051d6b74eb -s ours" into nyc-mr1-dev 
am: f7e165972f  -s ours

Change-Id: I02c1cbaec6994edc21b25413101f6dccbb1c091f
 2016-08-23 15:25:01 +00:00
Adam Seaton
bbbd17c67d Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads." into nyc-dr1-dev am: 051d6b74eb -s ours 
am: 6b5a4bf98b  -s ours

Change-Id: I6ca4a4f6d3a7269ec69ec3c9f0966237ab9cc5c3
 2016-08-23 15:25:00 +00:00
Tim Murray
b7b31b415a Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads. am: d72b26085c -s ours" into nyc-mr1-dev 
am: 6a1c2227be  -s ours

Change-Id: I4a384d1e1ea2cfb822fe56bbc3c0197891919678
 2016-08-23 15:24:55 +00:00
Tim Murray
4b4fe6e0f2 DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads. am: d72b26085c -s ours 
am: fbc47f734f  -s ours

Change-Id: I2174dc610823bc9a9ea58bbd55a30095db569c09
 2016-08-23 15:24:54 +00:00
Android Build Merger (Role)
effaf79494 Merge "Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw." into nyc-mr1-dev am: 4a6f3bb921" into cw-f-dev 2016-08-23 15:14:58 +00:00
Android Build Merger (Role)
eaef72bda5 Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw. am: 0cc68dbf29" into cw-f-dev 2016-08-23 15:14:39 +00:00
Android Build Merger (Role)
05f0dd1ed3 Merge "Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information" into nyc-dr1-dev am: ad1008d089 -s ours am: aad9147dca -s ours" into cw-f-dev 2016-08-23 15:14:22 +00:00
Android Build Merger (Role)
e8b0a5a01a Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information am: 05a1df9967 -s ours am: 33a04f8333 -s ours" into cw-f-dev 2016-08-23 15:14:05 +00:00
Android Build Merger (Role)
44fc86b8b8 Merge "Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev am: 0f1e7ab1d3 -s ours am: fcd16254c6 -s ours" into cw-f-dev 2016-08-23 15:13:47 +00:00
Android Build Merger (Role)
986912ee69 Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity. am: c9373e5505 -s ours am: 27d769e3b0 -s ours" into cw-f-dev 2016-08-23 15:13:29 +00:00
Sanket Padawe
078c557688 Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw." into nyc-mr1-dev 
am: 4a6f3bb921

Change-Id: Iae5f5a526b45c583eec1439bd43a6548b319c142
 2016-08-23 15:12:31 +00:00
Sanket Padawe
e8a2c5c331 If Vodafone Italy sim is in Spain consider it as roaming on Spain nw. 
am: 0cc68dbf29

Change-Id: I2aa45f5db13bc867a23663a14ab6330285a6e872
 2016-08-23 15:12:29 +00:00
Adam Seaton
7eaccf8e79 Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information" into nyc-dr1-dev am: ad1008d089 -s ours 
am: aad9147dca  -s ours

Change-Id: I7e5040b8246458a5a24afa28fec9469a4b223652
 2016-08-23 15:12:26 +00:00
Andy Hung
228a63ffac DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information am: 05a1df9967 -s ours 
am: 33a04f8333  -s ours

Change-Id: I123cf216c3654a4572d64400b91265f956d53ac7
 2016-08-23 15:12:25 +00:00
Adam Seaton
b9475468f5 Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev am: 0f1e7ab1d3 -s ours 
am: fcd16254c6  -s ours

Change-Id: Iff2337eeb9148078fc5f2774d5c72dbd39360fec
 2016-08-23 15:12:23 +00:00
George Mount
c9ec6286d1 DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity. am: c9373e5505 -s ours 
am: 27d769e3b0  -s ours

Change-Id: Ie414fbc28d07642febe6c6dcf2e30283fbc802c0
 2016-08-23 15:12:22 +00:00
Android Build Merger (Role)
dbb5845378 Merge "DO NOT MERGE ANYWHERE: Release mPackages lock earlier am: bab7c28e5e -s ours am: 655932af79 -s ours" into cw-f-dev 2016-08-23 15:11:07 +00:00
Android Build Merger (Role)
4e421445b0 Merge "Doc change: updates for final N landing page and related resources. am: b0ca00431f am: b78a9bc5fe am: 1dba7ddf3a" into cw-f-dev 2016-08-23 15:10:51 +00:00
Android Build Merger (Role)
5d653c4771 Merge "Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev am: 410ae5b004 am: e5036b3cab am: d6ad4f051e" into cw-f-dev 2016-08-23 15:10:35 +00:00
Android Build Merger (Role)
b0da43c8f2 Merge "Docs: Adding information to Building-for-Billions landing page. am: cbaf3f9986 am: 2663c419c0 am: 7208e94355" into cw-f-dev 2016-08-23 15:10:24 +00:00
Android Build Merger (Role)
9242f396a6 Merge "Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev am: 162a0005ac am: c02c6b8fb0 am: 32d77972d5" into cw-f-dev 2016-08-23 15:10:12 +00:00
Todd Kennedy
915771e5b6 DO NOT MERGE ANYWHERE: Release mPackages lock earlier am: bab7c28e5e -s ours 
am: 655932af79  -s ours

Change-Id: If5e283f29ca14e7eb7d2dbf7edefe3f5a2be4223
 2016-08-23 15:09:17 +00:00