Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,484 Commits 3 Branches 0 Tags
fb19d8d7c142aae0aaa9782db145fee072071fbf
Commit Graph

277484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sungsoo
68aa33b9bf DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f 
am: 29e643bcbd

Change-Id: I413ba35abfc8999c405df78a40b8182f19472b6a
 2016-10-13 22:01:39 +00:00
Sungsoo
016c5889bc DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 
am: bb800841ca

Change-Id: I93674ad50daa5c3b7411a87112ad33ce199e71ce
 2016-10-13 22:01:22 +00:00
Sungsoo
2816a5fa5e DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours 
am: 3992742559

Change-Id: I0b7cbc29fa69ff1170e377bd51621c5a5e14f793
 2016-10-13 22:00:51 +00:00
Sungsoo
8b764f10c3 DO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 
am: 11b522b40f  -s ours

Change-Id: I144aee71338030bd8db42cc8ba8c12976e371762
 2016-10-13 21:59:28 +00:00
Bill Yi
ade9e011a8 Import translations. DO NOT MERGE 
Change-Id: I825794cb543e17e2a5d2444c15a1dfdbdb048e23
Auto-generated-cl: translation import
 2016-10-13 14:58:39 -07:00
Sungsoo Lim
9dd9c5a856 Merge "ExifInterface: Provide backward compatibility" into nyc-dev 
am: e29077105e

Change-Id: I1591f2c41214c14bb85ea90d59e94a44dafe8a77
 2016-10-13 21:57:26 +00:00
Sungsoo
bc813cd510 ExifInterface: Provide backward compatibility 
am: 2dbe166801

Change-Id: I53f2bfb056d955c6693cb65c9cb9a21859ff7535
 2016-10-13 21:57:22 +00:00
Sungsoo Lim
013d3a4964 Merge "ExifInterface: Provide backward compatibility" into nyc-dev 
am: e29077105e

Change-Id: Ib5e0de24df22249be4cef4ccc0fee2dc56f45ebd
 2016-10-13 21:57:13 +00:00
Sungsoo
6e01f028ab ExifInterface: Provide backward compatibility 
am: 2dbe166801

Change-Id: I03afc66b63398a4c1e31324ad7d543fa1d9d0694
 2016-10-13 21:57:06 +00:00
Sungsoo
3992742559 DO NOT MERGE) ExifInterface: Provide backward compatibility 
am: 22bd36448e  -s ours

Change-Id: I13a49444b80cd07c0cb37f6b8fb514b5b04e61bb
 2016-10-13 21:57:01 +00:00
Sungsoo
29e643bcbd DO NOT MERGE) ExifInterface: Provide backward compatibility 
am: c11f599a2f

Change-Id: If503e3361e69ad88a166f145603273d728d65652
 2016-10-13 21:56:56 +00:00
Sungsoo
bb800841ca DO NOT MERGE) ExifInterface: Provide backward compatibility 
am: 7ce9243087

Change-Id: I3d46cccc578160d7da5ff81e0caa09a52a17e9eb
 2016-10-13 21:56:55 +00:00
Sungsoo
11b522b40f DO NOT MERGE) ExifInterface: Provide backward compatibility 
am: 87a9ac70c3

Change-Id: I6639c6763ee1f7d83d03cc6d5fa11cbf1516e7cc
 2016-10-13 21:54:25 +00:00
Sungsoo Lim
e29077105e Merge "ExifInterface: Provide backward compatibility" into nyc-dev 2016-10-13 21:46:41 +00:00
Christopher Tate
f722c821f7 Merge "Only full-data back up regular files + directories" into nyc-mr1-dev am: b3ca7c26e1 
am: 82d9562f27

Change-Id: I04da3aeeecb65c557fe0715d7d97d182f07c43f0
 2016-10-13 21:17:54 +00:00
Christopher Tate
86208efdc9 Only full-data back up regular files + directories am: da2018efeb 
am: 0d816b8f69

Change-Id: I3b28c373c58ebebf27b1297e770d2023767e6396
 2016-10-13 21:17:09 +00:00
Christopher Tate
82d9562f27 Merge "Only full-data back up regular files + directories" into nyc-mr1-dev 
am: b3ca7c26e1

Change-Id: I363cf717193316eaa9ad910284bb3140c6684dbc
 2016-10-13 21:13:03 +00:00
Christopher Tate
0d816b8f69 Only full-data back up regular files + directories 
am: da2018efeb

Change-Id: I6ecc74ee9613f221e24acca571560bf8190b7073
 2016-10-13 21:13:00 +00:00
Greg Plesur
fd6399698a Merge "DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade." into cw-f-dev 
am: 216ee1f0e7

Change-Id: I585c709c3a8648e754779c71497d18a35b321bb7
 2016-10-13 21:12:56 +00:00
Greg Plesur
43ed3a5b6a DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade. 
am: 3514404984

Change-Id: I8d24007831ba030af0d84f717802c79172db970f
 2016-10-13 21:12:51 +00:00
TreeHugger Robot
b3ca7c26e1 Merge "Only full-data back up regular files + directories" into nyc-mr1-dev 2016-10-13 21:07:00 +00:00
Greg Plesur
216ee1f0e7 Merge "DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade." into cw-f-dev 2016-10-13 21:02:01 +00:00
Robert Sesek
aa3c463a5b resolve merge conflicts of 0b58f19 to nyc-mr1-dev-plus-aosp 
Change-Id: I374d842cab49b58b570d5ad7ef3dffb7b148d236
 2016-10-13 16:49:47 -04:00
Dianne Hackborn
7990701a14 Merge "Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle" into nyc-mr1-dev am: 33e56a9e1f 
am: d3ad5ce147

Change-Id: Ic097998a5fdbe47831934baf0f8bdebcfd622007
 2016-10-13 20:41:01 +00:00
Dianne Hackborn
50468217c4 Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle am: 851ec49de7 
am: 9774ea3646

Change-Id: I7e27381f7fa4ca8770ca06cdc6c0bdd18a549ae2
 2016-10-13 20:38:04 +00:00
Dianne Hackborn
d3ad5ce147 Merge "Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle" into nyc-mr1-dev 
am: 33e56a9e1f

Change-Id: I74c2a5391f8eebf0544447886b14714fbd0202b1
 2016-10-13 20:36:38 +00:00
Dianne Hackborn
9774ea3646 Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle 
am: 851ec49de7

Change-Id: I8a5f8e28f8e4ca7e8fd20abacc0da1dae4055da7
 2016-10-13 20:31:43 +00:00
Dianne Hackborn
33e56a9e1f Merge "Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle" into nyc-mr1-dev 2016-10-13 20:21:25 +00:00
Svetoslav Ganov
e8e50a81ad Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev am: cba436b312 
am: 8d3fc0fd8a

Change-Id: I3002282020faf541fc37e1137a3c89d23b99f416
 2016-10-13 20:20:55 +00:00
Svetoslav Ganov
cf146edb32 Merge "Allow SetupWizard to do WiFi scans if location off" am: c98b34bdce 
am: 72510e6244

Change-Id: Ib4468dc91eae1f6c26cdde4b70e911aa38696e27
 2016-10-13 20:20:06 +00:00
Svetoslav Ganov
ebdcd873ec Allow SetupWizard to do WiFi scans if location off am: b2457c3704 
am: ff484bbfeb

Change-Id: I7f6cda2da22347375507a0364e976bbb01066ccc
 2016-10-13 20:19:45 +00:00
Svetoslav Ganov
72510e6244 Merge "Allow SetupWizard to do WiFi scans if location off" 
am: c98b34bdce

Change-Id: Ibfd31e4ce200479201abb14c28d883b556a62b6b
 2016-10-13 20:15:38 +00:00
Svetoslav Ganov
8d3fc0fd8a Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev 
am: cba436b312

Change-Id: Iccde94bb855b3461ddb804b69182c439f9c07e1f
 2016-10-13 20:15:19 +00:00
Svetoslav Ganov
ff484bbfeb Allow SetupWizard to do WiFi scans if location off 
am: b2457c3704

Change-Id: I3afe3d8628e8af5806b03b86ea5c866fd454cddd
 2016-10-13 20:15:16 +00:00
Svetoslav Ganov
c98b34bdce Merge "Allow SetupWizard to do WiFi scans if location off" 2016-10-13 20:06:38 +00:00
Svetoslav Ganov
cba436b312 Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev 2016-10-13 20:06:02 +00:00
Android Build Merger (Role)
abbc2ec40b Merge "Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev am: 2acaf0a120 am: f3d638b1d3" into nyc-mr1-dev-plus-aosp 2016-10-13 19:21:38 +00:00
Kevin Hufnagle
6e9ea6aef5 Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev am: 2acaf0a120 
am: f3d638b1d3

Change-Id: I1613de506cb28ae1bb0e24afce1f9262e780332d
 2016-10-13 19:20:48 +00:00
Android Build Merger (Role)
c101d1bd68 Merge "docs: Removed "Accessibility" page from "Pure Android" design docs am: 1965375aa5 am: 906703d124" into nyc-mr1-dev-plus-aosp 2016-10-13 19:20:31 +00:00
Kevin Hufnagle
e882dc02dd docs: Removed "Accessibility" page from "Pure Android" design docs am: 1965375aa5 
am: 906703d124

Change-Id: I4bc463517602130e36d6ff126f7387214073f4cc
 2016-10-13 19:19:55 +00:00
Christopher Tate
da2018efeb Only full-data back up regular files + directories 
Ignore every filesystem entity that is not a regular file or directory.
In particular, we now ignore not only symlinks but also sockets, pipes,
et cetera.

Bug 32143362

Change-Id: If51b54df1f7a643af145eb15bf12d389d19f8780
 2016-10-13 12:19:45 -07:00
Android Build Merger (Role)
ec7800d970 Merge "docs: Changed Google Analytics link to https:// am: 374ddfe529 am: b3fcc389d2" into nyc-mr1-dev-plus-aosp 2016-10-13 19:19:41 +00:00
Andrew Solovay
dfb4cf4637 docs: Changed Google Analytics link to https:// am: 374ddfe529 
am: b3fcc389d2

Change-Id: Ib2514a3735156498573e84daaba68fe2dfcd49ce
 2016-10-13 19:18:57 +00:00
Android Build Merger (Role)
12d33edbf2 Merge "Merge "docs: Add Android developer written case studies" into nyc-dev am: d2c5657e9c am: e28b5e72af" into nyc-mr1-dev-plus-aosp 2016-10-13 19:18:42 +00:00
Joe Fernandez
ddba4478bf Merge "docs: Add Android developer written case studies" into nyc-dev am: d2c5657e9c 
am: e28b5e72af

Change-Id: I0f92c59eabacfce3f8b206fcda8ceac143bfc1e4
 2016-10-13 19:18:08 +00:00
Android Build Merger (Role)
420f73e0ab Merge "docs: Add Android developer written case studies am: cf71b1fdc0 am: 22008c24ed" into nyc-mr1-dev-plus-aosp 2016-10-13 19:17:54 +00:00
George French
266933234a docs: Add Android developer written case studies am: cf71b1fdc0 
am: 22008c24ed

Change-Id: I12ec64b7e0362728eca32ca61795e65904cc9b74
 2016-10-13 19:17:22 +00:00
Android Build Merger (Role)
f051de84d5 Merge "Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev am: 4bd56fbbee am: 622e97ffaf" into nyc-mr1-dev-plus-aosp 2016-10-13 19:17:22 +00:00
Chris Tate
9f65c6d017 Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev am: 4bd56fbbee 
am: 622e97ffaf

Change-Id: I5ebed04800d3acf758787067b63bca50fa957649
 2016-10-13 19:16:47 +00:00
Joe Fernandez
490a707129 Merge "Docs: Developer written case studies batch 3 (proj 31)" into nyc-dev am: cae752e66b 
am: c923831485

Change-Id: Icc9e5f1076d73f5a4701f28af60fafa99f80fa72
 2016-10-13 19:16:35 +00:00